添加新功能

陈奇

2019-05-29 c5bf501d8b507d1e3e79541e7ac9b45910860b4d

 app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java

@@ -137,11 +137,9 @@
            if (mBluetoothService == null) {
                return;
            }

            String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
            if (!TextUtils.isEmpty(mac) && MainApp.theApp.bleManager.isBlueEnable()) {
                if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
                    return;
                }
                mBluetoothService.scanAndConnect5(mac);
            }
        }
@@ -234,15 +232,16 @@
                        new BleCharacterCallback() {
                            @Override
                            public void onSuccess(final BluetoothGattCharacteristic characteristic) {
                                final String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
                                stringResult.append(result);
                                getActivity().runOnUiThread(new Runnable() {

                                    @Override
                                    public void run() {
                                        String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
                                        stringResult.append(result);
                                        doHandleData(result);
                                        stringResult = new StringBuilder();
                                    }
                                });
                                stringResult = new StringBuilder();
                                HEARTTIMES = 30;
                            }

@@ -329,7 +328,6 @@
            voiceBean.setName("严重铃声");
            voiceList.add(voiceBean);
        }

    }

    @Override
@@ -348,7 +346,6 @@
    @Override
    public void onPause() {
        super.onPause();
        System.out.println("chenqi onPause");
        isMySelfPage = false;
        stopReconnect();
    }
@@ -356,7 +353,6 @@
    @Override
    public void onDestroy() {
        super.onDestroy();
        System.out.println("chenqi onDestroy");
        EventBus.getDefault().unregister(this);
        handler.removeCallbacksAndMessages(null);
        stop();
@@ -568,6 +564,7 @@
     * @param level
     */
    private void showStatus(int level) {
        System.out.println("chenqi level " + level + " 类型 " + type);
        int yanzhang = R.mipmap.icon_yanzhong;
        int danger = R.mipmap.icon_danger;
        iv_dianliang.setVisibility(View.VISIBLE);
@@ -588,6 +585,7 @@
        }

        if (level == 0) {
            System.out.println("chenqi 辐射安全");
            tv_tishi.setText("当前辐射安全");
            tv_tishi.setBackgroundResource(R.mipmap.bt_green);
            iv_bottom_status.setImageResource(R.mipmap.icon_good);
@@ -687,7 +685,7 @@
     */
    //todo 解析实时数据
    private void parseCurrentData(String nowResult) {
        System.out.println("chenqi nowResult parseCurrentData");
        System.out.println("chenqi nowResult parseCurrentData" + nowResult);
        type = 1;
        if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) {
            int real = Integer.parseInt(nowResult.substring(24, 26), 16) * 256 + Integer.parseInt(nowResult.substring(26, 28), 16);
@@ -762,14 +760,13 @@
    /**
     * 7A开头的是电离
     * 7A0024010002D8B04CE90E6300000003000003EE0000000000000EC6000000000017347B0D0A
     * <p>
     * 电磁辐射显示
     */
    private void parseHoutData(String nowResult) {
        System.out.println("chenqi parseHoutData first" + nowResult);
        if (TextUtils.isEmpty(nowResult)) {
            return;
        }
        System.out.println("chenqi parseHoutData begin" + nowResult);
        type = 2;
        String[] strings = StringUtils.splitString(nowResult, 2);
        if (strings[0].startsWith("7A") && strings[35].endsWith("7B")) {
@@ -800,8 +797,6 @@
            data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
            data.setType(0);

            showStatus(Integer.parseInt(strings[21], 16));

            if (baojing == 0) {
                pv.setPercent((float) (0.125));
                showStatus(0);
@@ -822,8 +817,8 @@
                }
            } else if (baojing == 2) {
                data.setIs_warn(1);
                showStatus(2);
                pv.setPercent((float) (0.625));
                showStatus(2);
                play(1);
                if (!isVirating) {
                    isVirating = true;
@@ -831,8 +826,10 @@
                }
            } else if (baojing == 3 || baojing == 4) {
                data.setIs_warn(1);
                if (baojing == 4) {
                    pv.setPercent((float) (1));
                } else pv.setPercent((float) (0.875));
                showStatus(3);
                pv.setPercent((float) (0.875));
                play(2);
                if (!isVirating) {
                    isVirating = true;
@@ -887,10 +884,11 @@
     */
    private void showPower(int b1, int b2) {
        if (b1 == 1) {
            iv_dianliang.setVisibility(View.VISIBLE);
            ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
            showStatus(-2);
        } else if (b1 == 2) {
            ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_full, iv_dianliang);
            iv_dianliang.setVisibility(View.GONE);
        } else {
            if (b2 == 0) {
                ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b00, iv_dianliang);