From 82cc6c94fdc08b1814fbf7195e88cf335eed3e8d Mon Sep 17 00:00:00 2001
From: haijiang <181069201@qq.com>
Date: Wed, 19 Sep 2018 14:00:15 +0800
Subject: [PATCH] 提交

---
 app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java |   36 +++++++++++++++++++++++++++++++++---
 1 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
index 818c010..09ac5d4 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -271,6 +271,7 @@
                 heart();
             }
         } else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
+            preLevel = -1;
             showStatus(-1);
             pv.setStatusStr("���������");
             pv.setPercent(0);
@@ -278,6 +279,9 @@
             tv_shishi.setText("0");
             chonglian();
             stop();
+            isVirating = false;
+            AudioUtils.virateCancle(getActivity());
+
         } else if (msg.getType() == AppConfig.CHANGE_SETTING) {
             if (timer != null) {
                 timer.cancel();
@@ -288,6 +292,30 @@
             doTask();
         } else if (msg.getType() == AppConfig.SET_MAIN_CALL) {
             ((MainActivity) getActivity()).resetBLECallBack();
+        }else if (msg.getType() == AppConfig.SET_VOICE) {
+            ArrayList<VoiceBean> temp = (ArrayList<VoiceBean>) FastJsonTools.getArrayJson(MainApp.theApp.sharedPreferencesUtil.getVideoList(), VoiceBean.class);
+            if (temp != null) {
+                voiceList.clear();
+                voiceList.addAll(temp);
+            } else {
+                voiceList.clear();
+                VoiceBean voiceBean = new VoiceBean();
+                voiceBean.setId(0);
+                voiceBean.setRes(AppConfig.voideUrl1);
+                voiceBean.setName("������������");
+                voiceList.add(voiceBean);
+                voiceBean = new VoiceBean();
+                voiceBean.setId(1);
+                voiceBean.setRes(AppConfig.voideUrl2);
+                voiceBean.setName("������������");
+                voiceList.add(voiceBean);
+                voiceBean = new VoiceBean();
+                voiceBean.setId(2);
+                voiceBean.setRes(AppConfig.voideUrl3);
+                voiceBean.setName("������������");
+                voiceList.add(voiceBean);
+            }
+
         }
     }
 
@@ -303,17 +331,17 @@
             voiceList.clear();
             VoiceBean voiceBean = new VoiceBean();
             voiceBean.setId(0);
-            voiceBean.setRes(VoiceSetActivity.voideUrl1);
+            voiceBean.setRes(AppConfig.voideUrl1);
             voiceBean.setName("������������");
             voiceList.add(voiceBean);
             voiceBean = new VoiceBean();
             voiceBean.setId(1);
-            voiceBean.setRes(VoiceSetActivity.voideUrl2);
+            voiceBean.setRes(AppConfig.voideUrl2);
             voiceBean.setName("������������");
             voiceList.add(voiceBean);
             voiceBean = new VoiceBean();
             voiceBean.setId(2);
-            voiceBean.setRes(VoiceSetActivity.voideUrl3);
+            voiceBean.setRes(AppConfig.voideUrl3);
             voiceBean.setName("������������");
             voiceList.add(voiceBean);
         }
@@ -343,6 +371,8 @@
             chonglianTimer = null;
         }
         stop();
+        isVirating = false;
+        AudioUtils.virateCancle(getActivity());
     }
 
     @Override

--
Gitblit v1.8.0