From 47f5d71a81a528aff225805d28bf181ce4d6f55d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 15 Nov 2018 13:14:43 +0800
Subject: [PATCH] [*]1.0.3.2版本
---
app/src/main/java/com/moral/yunfushao/activity/ChooseSongActivity.java | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/activity/ChooseSongActivity.java b/app/src/main/java/com/moral/yunfushao/activity/ChooseSongActivity.java
index be9d00a..8e95b39 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ChooseSongActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ChooseSongActivity.java
@@ -3,48 +3,38 @@
import android.content.Intent;
import android.content.res.AssetManager;
import android.media.MediaPlayer;
-import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.v7.widget.RecyclerView;
-import android.util.Log;
import android.view.View;
-import com.lzy.okgo.cache.CacheMode;
import com.moral.andbrickslib.baseadapter.headandfooter.DividerItemDecoration;
import com.moral.andbrickslib.baseadapter.recyclerview.MultiItemTypeAdapter;
-import com.moral.yunfushao.MainApp;
import com.moral.yunfushao.R;
import com.moral.yunfushao.adapter.SongAdapter;
-import com.moral.yunfushao.adapter.VoiceAdapter;
import com.moral.yunfushao.base.BaseListActivity;
-import com.moral.yunfushao.common.API;
-import com.moral.yunfushao.httputils.HttpCallBack;
-import com.moral.yunfushao.httputils.HttpUtils;
import com.moral.yunfushao.model.Song;
-import com.moral.yunfushao.model.VoiceBean;
import com.moral.yunfushao.utils.AudioUtils;
+import com.moral.yunfushao.utils.PermissionUtil;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
/**
* Created by haijiang on 2017/7/12.
*/
-public class ChooseSongActivity extends BaseListActivity implements SongAdapter.OnBtnClickListener{
+public class ChooseSongActivity extends BaseListActivity implements SongAdapter.OnBtnClickListener {
private SongAdapter adapter;
private ArrayList<Song> voiceList = new ArrayList<>();
AssetManager am;
MediaPlayer mp;
- Handler mHandler = new Handler(){
+ Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
super.handleMessage(msg);
- if(msg.what == 1){
+ if (msg.what == 1) {
setNormalView();
mPtrFrame.refreshComplete();
adapter.notifyDataSetChanged();
@@ -52,9 +42,11 @@
}
};
private int index;
+
@Override
protected void initOtherView() {
- index = getIntent().getIntExtra("position",0);
+ PermissionUtil.verifyStoragePermissions(this);
+ index = getIntent().getIntExtra("position", 0);
tv_title.setText("������������");
DividerItemDecoration line = new DividerItemDecoration(this, DividerItemDecoration.VERTICAL_LIST);
mRecyclerView.addItemDecoration(line);
@@ -78,7 +70,6 @@
protected void onLoadMore() {
-
}
@Override
@@ -89,7 +80,7 @@
@Override
protected void onDestroy() {
super.onDestroy();
- if(mp!=null&&mp.isPlaying()){
+ if (mp != null && mp.isPlaying()) {
mp.stop();
mp.release();
}
@@ -104,18 +95,21 @@
protected void initListener() {
}
- Thread mThread;
+
+ Thread mThread;
+
@Override
protected void initData() {
getData();
}
- private void getData(){
+
+ private void getData() {
setLoadingView();
mThread = new Thread(new Runnable() {
@Override
public void run() {
ArrayList<Song> temp = AudioUtils.getAllSongs(ChooseSongActivity.this);
- if(temp!=null){
+ if (temp != null) {
voiceList.clear();
voiceList.addAll(temp);
mHandler.sendEmptyMessage(1);
@@ -127,7 +121,7 @@
@Override
protected void processClick(View view) {
- switch (view.getId()){
+ switch (view.getId()) {
case R.id.tv_left:
finish();
break;
@@ -143,14 +137,14 @@
@Override
public void playClick(int position) {
Song voiceBean = voiceList.get(position);
- if(voiceBean.isPlay()){
+ if (voiceBean.isPlay()) {
mp.stop();
voiceBean.setPlay(false);
- }else{
- if(mp!=null&&mp.isPlaying()){
+ } else {
+ if (mp != null && mp.isPlaying()) {
mp.stop();
mp.release();
- for (Song voice :voiceList){
+ for (Song voice : voiceList) {
voice.setPlay(false);
}
adapter.notifyDataSetChanged();
@@ -171,10 +165,10 @@
@Override
public void setClick(int position) {
Intent intent = new Intent();
- intent.putExtra("position",index);
- intent.putExtra("url",voiceList.get(position).getFileUrl());
- intent.putExtra("name",voiceList.get(position).getTitle());
- setResult(RESULT_OK,intent);
+ intent.putExtra("position", index);
+ intent.putExtra("url", voiceList.get(position).getFileUrl());
+ intent.putExtra("name", voiceList.get(position).getTitle());
+ setResult(RESULT_OK, intent);
finish();
}
}
--
Gitblit v1.8.0