From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能

---
 app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java |  157 ++++++++++++++++++++++++++-------------------------
 1 files changed, 80 insertions(+), 77 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 c4c4445..a8459c9 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -64,8 +64,6 @@
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
-import java.util.Timer;
-import java.util.TimerTask;
 
 /**
  * ������������
@@ -98,11 +96,12 @@
 
     //������������
     private int HEARTTIMES = 2;
-    //������������
-    private int RECONNECTTIMES = 8000;
+
+    //������������������
+    private boolean isMySelfPage = false;
+
     //handler������������
     private Handler handler = new Handler();
-
 
     private Runnable heartRunnable = new Runnable() {
         @Override
@@ -126,26 +125,23 @@
             FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),
                     FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(),
                     BLECommon.BLE_HEART, null);
-            Log.d(TGA, "������������");
             heart();
         }
     };
+
+
     private Runnable reconnectRunnable = new Runnable() {
         @Override
         public void run() {
             //������
-            if (FragmentMonitor.this.mBluetoothService == null) {
+            if (mBluetoothService == null) {
                 return;
             }
+
             String mac = MainApp.theApp.sharedPreferencesUtil.getBLE();
             if (!TextUtils.isEmpty(mac) && MainApp.theApp.bleManager.isBlueEnable()) {
-                if (MainApp.theApp.bleManager.isConnectingOrConnected()) {
-                    return;
-                }
-                Log.d(TGA, "������������");
-                FragmentMonitor.this.mBluetoothService.scanAndConnect5(mac);
+                mBluetoothService.scanAndConnect5(mac);
             }
-            reconnect();
         }
     };
 
@@ -196,11 +192,12 @@
      */
     @Subscribe(threadMode = ThreadMode.MAIN, sticky = true)
     public void eventComing(EventMessage msg) {
+        mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
         if (msg.getType() == AppConfig.GET_BLE_SERVICE) {
             resetHandler();
+            textShowMac();//
             pv.setStatusStr("���������");
             //������������
-            mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
             ((MainActivity) getActivity()).resetBLECallBack();
             if (mBluetoothService != null) {
                 BluetoothGatt gatt = mBluetoothService.getGatt();
@@ -211,8 +208,8 @@
                             mBluetoothService.setService(service);
                             break;
                         }
-                    }
-                    //������������
+
+                    }//������������
                     for (BluetoothGattCharacteristic characteristic : mBluetoothService.getService().getCharacteristics()) {
                         int charaProp = characteristic.getProperties();
                         if ((charaProp & BluetoothGattCharacteristic.PROPERTY_READ) > 0) {
@@ -235,45 +232,42 @@
                         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;
                             }
 
                             @Override
                             public void onFailure(final BleException exception) {
+
                             }
 
                             @Override
                             public void onInitiatedResult(boolean result) {
                             }
                         });
-                /**
-                 * ������������������
-                 */
-//                handler.postDelayed(runnable, 5000);
+                //������handler
+                HEARTTIMES = 2;
+                //������������
                 heart();
             }
         } else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
             preLevel = -1;
             showStatus(-1);
-            handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
+            reconnect();
             stop();
             isVirating = false;
             AudioUtils.virateCancle(getActivity());
-
         } else if (msg.getType() == AppConfig.CHANGE_SETTING) {
-            if (timer != null) {
-                timer.cancel();
-                timer = null;
-            }
+            handler.removeCallbacks(taskRunnable);
             submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
             isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
             doTask();
@@ -304,6 +298,7 @@
             }
         } else if (msg.getType() == AppConfig.BLUETOOCH_CHANGE_CONNECT) {
             showStatus(-1);
+            stopReconnect();
         }
     }
 
@@ -333,29 +328,32 @@
             voiceBean.setName("������������");
             voiceList.add(voiceBean);
         }
-
     }
 
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
-        FragmentMonitor.this.mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
+        mBluetoothService = ((MainActivity) getActivity()).getBluetoothService();
     }
 
     @Override
     public void onResume() {
         super.onResume();
+        isMySelfPage = true;
         textShowMac();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        isMySelfPage = false;
+        stopReconnect();
     }
 
     @Override
     public void onDestroy() {
         super.onDestroy();
         EventBus.getDefault().unregister(this);
-        if (timer != null) {
-            timer.cancel();
-            timer = null;
-        }
         handler.removeCallbacksAndMessages(null);
         stop();
         isVirating = false;
@@ -413,7 +411,7 @@
         iv_search.setOnClickListener(this);
     }
 
-    int submitTime;
+    int submitTime = 0;
     int isupLoad;
 
     @Override
@@ -458,14 +456,13 @@
 
     @Override
     protected void processClick(View v) {
-        Intent intent = null;
+        Intent intent;
         switch (v.getId()) {
             case R.id.pv:
                 if (MainApp.theApp.bleManager == null || !(MainApp.theApp.bleManager != null && MainApp.theApp.bleManager.isSupportBle())) {
                     return;
                 }
-                intent = new Intent(getActivity(), BLESearchActivity.class);
-                startActivity(intent);
+                startActivity(new Intent(getActivity(), BLESearchActivity.class));
                 break;
             case R.id.iv_his:
                 intent = new Intent(getActivity(), ChartActivity.class);
@@ -483,33 +480,49 @@
 
     }
 
-    Timer timer;
+    Runnable taskRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (isupLoad == 1) {
+                //������������
+                submitData();
+            }
+            doTask();
+        }
+    };
 
     private void doTask() {
-        timer = new Timer();
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                if (isupLoad == 1) {
-                    //������������
-                    submitData();
-                }
-            }
-        }, 0, submitTime * 1000);
+        if (submitTime == 0) {
+            submitTime = 20;
+        }
+        handler.postDelayed(taskRunnable, submitTime * 1000);
     }
 
     private void heart() {
         handler.postDelayed(heartRunnable, 1000 * HEARTTIMES);
     }
 
+    /**
+     * ������������
+     */
     private void reconnect() {
-        handler.postDelayed(reconnectRunnable, RECONNECTTIMES);
+        if (isMySelfPage) {
+            stopReconnect();
+            //���������������������
+            handler.postDelayed(reconnectRunnable, 0);
+        }
+    }
+
+    /**
+     * ������������
+     */
+    private void stopReconnect() {
+        handler.removeCallbacks(reconnectRunnable);
     }
 
     private void resetHandler() {
         handler.removeCallbacks(reconnectRunnable);
         handler.removeCallbacks(heartRunnable);
-        HEARTTIMES = 2;
     }
 
     private void submitData() {
@@ -551,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);
@@ -560,17 +574,18 @@
             danger = R.mipmap.icon_danger;
             tvLijiTitle.setText("������������(uSv)");
             tvShishiTitle.setText("������������(uSv/h)");
-            iv_dianliang.setEnabled(false);
+//            iv_dianliang.setEnabled(false);
         } else if (type == 2) {
             //������
             yanzhang = R.mipmap.dianliyanyang;
             danger = R.mipmap.dianlidanger;
             tvLijiTitle.setText("������������");
             tvShishiTitle.setText("������������");
-            iv_dianliang.setEnabled(true);
+//            iv_dianliang.setEnabled(true);
         }
 
         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);
@@ -607,7 +622,6 @@
             tv_status.setTextColor(getResources().getColor(R.color.red_txt));
             ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
         } else if (level == -1) {
-            iv_dianliang.setVisibility(View.GONE);
             tv_tishi.setText("������������������");
             tv_tishi.setBackgroundResource(R.mipmap.bt_offline);
             iv_bottom_status.setImageResource(R.mipmap.icon_offline);
@@ -637,7 +651,7 @@
 
     private void textShowMac() {
         if (BuildConfig.BUILD_TYPE.equals(VersionConstants.DEBUG)) {
-            final TextView tv_text_mac = (TextView) findView(R.id.tv_text_mac);
+            final TextView tv_text_mac = findView(R.id.tv_text_mac);
             tv_desc.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -671,14 +685,13 @@
      */
     //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);
             int leijiValue = Integer.parseInt(nowResult.substring(28, 30), 16) * 1024 + Integer.parseInt(nowResult.substring(30, 32), 16) * 512 + Integer.parseInt(nowResult.substring(32, 34), 16) * 256 + Integer.parseInt(nowResult.substring(34, 36), 16);
             int b1 = Integer.parseInt(nowResult.substring(6, 8), 16);
             int b2 = Integer.parseInt(nowResult.substring(12, 14), 16);
-//            XLog.d("���������" + shunshiValue + "|���������" + leijiValue + "-----���������" + b1 + "|" + b2);
             tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + "");
             double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
             tv_shishi.setText(realValue + "");
@@ -747,6 +760,7 @@
     /**
      * 7A������������������
      * 7A0024010002D8B04CE90E6300000003000003EE0000000000000EC6000000000017347B0D0A
+     * <p>
      * ������������������
      */
     private void parseHoutData(String nowResult) {
@@ -777,16 +791,11 @@
 
             tv_ljjl.setText(elecValue + "(��T)");
 
-            /**
-             * ���������������������
-             */
+            //���������������������
             RecData data = new RecData();
             data.setValue(electricFieldValue);
             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));
@@ -808,26 +817,19 @@
                 }
             } else if (baojing == 2) {
                 data.setIs_warn(1);
-                showStatus(2);
                 pv.setPercent((float) (0.625));
+                showStatus(2);
                 play(1);
                 if (!isVirating) {
                     isVirating = true;
                     AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
                 }
-            } else if (baojing == 3) {
+            } 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;
-                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
-                }
-            } else if (baojing == 4) {
-                data.setIs_warn(1);
-                showStatus(3);
-                pv.setPercent((float) (1.00));
                 play(2);
                 if (!isVirating) {
                     isVirating = true;
@@ -882,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);

--
Gitblit v1.8.0