提交

haijiang

2018-09-19 82cc6c94fdc08b1814fbf7195e88cf335eed3e8d

 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