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/VoiceSetActivity.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java b/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java
index 5149048..9a8bd29 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/VoiceSetActivity.java
@@ -20,7 +20,6 @@
import com.moral.yunfushao.R;
import com.moral.yunfushao.adapter.VoiceAdapter;
import com.moral.yunfushao.base.BaseListActivity;
-import com.moral.yunfushao.ble.BLECommon;
import com.moral.yunfushao.common.API;
import com.moral.yunfushao.common.AppConfig;
import com.moral.yunfushao.httputils.HttpCallBack;
@@ -46,6 +45,7 @@
MediaPlayer mp;
private MaterialDialog resetDialog;
+ private int oldType = 0;
private void showReset() {
resetDialog = MaterialDialogUtils.showCallBaclDialog(this, "������������", "���������������������������?", new MaterialDialog.SingleButtonCallback() {
@@ -101,6 +101,8 @@
MainApp.theApp.sharedPreferencesUtil.saveVideoList(FastJsonTools.toJson(voiceList));
adapter.notifyDataSetChanged();
mToatUtils.showSingleLongToast("������������������");
+ oldType = MainApp.theApp.sharedPreferencesUtil.getVoiceType();
+ MainApp.theApp.sharedPreferencesUtil.saveVoiceType(3);
EventMessage eventMessage = new EventMessage();
eventMessage.setType(AppConfig.SET_VOICE);
EventBus.getDefault().post(eventMessage);
@@ -184,8 +186,10 @@
adapter.notifyDataSetChanged();
}
if (voiceBean.isDefaultMusic()) {
- mp = MediaPlayer.create(this, Uri.parse(voiceBean.getRes()));
- mp.start();
+ if (voiceBean.getRes() != null) {
+ mp = MediaPlayer.create(this, Uri.parse(voiceBean.getRes()));
+ mp.start();
+ }
} else {
mp = new MediaPlayer();
try {
@@ -269,6 +273,7 @@
voiceBean.setVoiceName("������");
voiceList.add(voiceBean);
MainApp.theApp.sharedPreferencesUtil.saveVideoList(FastJsonTools.toJson(voiceList));
+ MainApp.theApp.sharedPreferencesUtil.saveVoiceType(oldType);
adapter.notifyDataSetChanged();
EventMessage eventMessage = new EventMessage();
eventMessage.setType(AppConfig.SET_VOICE);
--
Gitblit v1.8.0