From cdbaf79d124d46b69dc62b653fde55f9d40b5534 Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Thu, 01 Nov 2018 17:23:32 +0800
Subject: [PATCH] [*]修改电磁版本

---
 app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java |  629 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 428 insertions(+), 201 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 7713628..fd7ea84 100644
--- a/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
+++ b/app/src/main/java/com/moral/yunfushao/fragment/FragmentMonitor.java
@@ -1,5 +1,7 @@
 package com.moral.yunfushao.fragment;
 
+import android.animation.Animator;
+import android.animation.ObjectAnimator;
 import android.annotation.SuppressLint;
 import android.bluetooth.BluetoothGatt;
 import android.bluetooth.BluetoothGattCharacteristic;
@@ -17,6 +19,7 @@
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
+import android.view.animation.OvershootInterpolator;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -37,7 +40,6 @@
 import com.moral.yunfushao.R;
 import com.moral.yunfushao.activity.BLESearchActivity;
 import com.moral.yunfushao.activity.ChartActivity;
-import com.moral.yunfushao.activity.VoiceSetActivity;
 import com.moral.yunfushao.base.BaseFragment;
 import com.moral.yunfushao.ble.BLECommon;
 import com.moral.yunfushao.ble.BluetoothService;
@@ -51,6 +53,8 @@
 import com.moral.yunfushao.model.UpLoadParam;
 import com.moral.yunfushao.model.VoiceBean;
 import com.moral.yunfushao.ui.PanelView;
+import com.moral.yunfushao.utils.AudioUtils;
+import com.moral.yunfushao.utils.DebugUtils;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -75,22 +79,86 @@
     private ArrayList<VoiceBean> voiceList = new ArrayList<>();
     AssetManager am;
     MediaPlayer mp;
-
-    private LinearLayout ll_status;
-    private TextView tv_ljjl, tv_tishi, tv_desc, tv_shishi, tv_status;
+    private boolean isVirating = false;
+    private LinearLayout ll_status, lv_ljjl;
+    private TextView tv_ljjl, tv_tishi, tv_desc, tv_shishi, tv_status, tv_dianliang2, tvLijiTitle, tvShishiTitle;
     private PanelView pv;
     private ImageView iv_his, iv_status, iv_search, iv_bottom_status, iv_dianliang;
     private BluetoothService mBluetoothService;
-    private ArrayList<String> realResult = new ArrayList<>();
-    private ArrayList<String> realHourResult = new ArrayList<>();
-    private ArrayList<String> realHisResult = new ArrayList<>();
+    private int type = 1;
     //������������
     private ArrayList<RecData> submitResult = new ArrayList<>();
-    private ArrayList<RecData> submitHisResult = new ArrayList<>();
+
+    private StringBuilder stringResult = new StringBuilder();
+
     //������������������������
     private ArrayList<RecData> submitTempResult = new ArrayList<>();
     private Timer heartTimer, resTimer, chonglianTimer;
-    Handler handler = new Handler();
+
+    private Handler handler = new Handler();
+
+    private Runnable runnable = new Runnable() {
+        @Override
+        public void run() {
+            checkTime();
+            checkTimeCount++;
+            handler.postDelayed(this, 5000);
+        }
+    };
+
+    private int checkTimeCount = 0;
+
+    private void doHandleData(String result) {
+        if (StringUtils.isEmpty(result)) {
+            return;
+        }
+
+        //������������"������������������������������"���������5������������������������������������������
+        if (result.startsWith(BLECommon.BLE_REC_TIME) || checkTimeCount > 5) {
+            DebugUtils.sendData("data", result);
+
+            handler.removeCallbacks(runnable);
+            checkTimeCount = 0;
+
+            result = result.substring(14);
+            doHandleData(result);
+        }
+
+        if (result.startsWith("3A")) {
+            if (result.length() >= 16) {
+                DebugUtils.sendData("data", result);
+
+                parseHisData(result.substring(0, 16));
+                result = result.substring(16);
+                doHandleData(result);
+            } else {
+                stringResult.append(result);
+            }
+        }
+
+        if (result.startsWith("5A")) {
+            if (result.length() >= 40) {
+                DebugUtils.sendData("data", result);
+                parseCurrentData(result.substring(0, 40));
+                result = result.substring(40);
+                doHandleData(result);
+            } else {
+                stringResult.append(result);
+            }
+        }
+
+        if (result.startsWith("7A")) {
+            if (result.length() >= 76) {
+                DebugUtils.sendData("data", result);
+                parseHoutData(result.substring(0, 76));
+                mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_SEND_7A, null);
+                result = result.substring(76);
+                doHandleData(result);
+            } else {
+                stringResult.append(result);
+            }
+        }
+    }
 
     /**
      * ������
@@ -140,18 +208,16 @@
                         mBluetoothService.getCharacteristic().getService().getUuid().toString(),
                         mBluetoothService.getCharacteristic().getUuid().toString(),
                         new BleCharacterCallback() {
-
                             @Override
                             public void onSuccess(final BluetoothGattCharacteristic characteristic) {
                                 getActivity().runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
-//                                        Log.d("haijiang", "������������====" + StringUtils.byteArrayToHexStr(characteristic.getValue()));
                                         String result = StringUtils.byteArrayToHexStr(characteristic.getValue());
-                                        //������������
-                                        parseCurrentData(result);
-                                        parseHisData(result);
-                                        parseHoutData(result);
+                                        stringResult.append(result);
+                                        doHandleData(result);
+
+                                        stringResult = new StringBuilder();
                                     }
                                 });
                             }
@@ -165,17 +231,12 @@
                             public void onInitiatedResult(boolean result) {
 
                             }
-
                         });
                 /**
                  * ������������������
                  */
-                handler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
-                        checkTime();
-                    }
-                }, 2000);
+                handler.postDelayed(runnable, 5000);
+
                 /**
                  * ������������������������
                  */
@@ -189,6 +250,7 @@
                 heart();
             }
         } else if (msg.getType() == AppConfig.GET_BLE_DISCONNECT) {
+            preLevel = -1;
             showStatus(-1);
             pv.setStatusStr("���������");
             pv.setPercent(0);
@@ -196,6 +258,9 @@
             tv_shishi.setText("0");
             chonglian();
             stop();
+            isVirating = false;
+            AudioUtils.virateCancle(getActivity());
+
         } else if (msg.getType() == AppConfig.CHANGE_SETTING) {
             if (timer != null) {
                 timer.cancel();
@@ -204,8 +269,32 @@
             submitTime = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getRefresh_frequency();
             isupLoad = MainApp.theApp.sharedPreferencesUtil.getLoginInfo().getIs_open_upload();
             doTask();
-        }else if(msg.getType()==AppConfig.SET_MAIN_CALL){
+        } 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);
+            }
+
         }
     }
 
@@ -221,17 +310,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);
         }
@@ -261,6 +350,8 @@
             chonglianTimer = null;
         }
         stop();
+        isVirating = false;
+        AudioUtils.virateCancle(getActivity());
     }
 
     @Override
@@ -282,6 +373,25 @@
         iv_search = findView(R.id.iv_search);
         iv_bottom_status = findView(R.id.iv_bottom_status);
         iv_dianliang = findView(R.id.iv_dianliang);
+        tv_dianliang2 = findView(R.id.tv_dianliang2);
+        tvShishiTitle = findView(R.id.tv_shishi_title);
+        tvLijiTitle = findView(R.id.tv_ljjl_title);
+        lv_ljjl = findView(R.id.lv_ljjl);
+        iv_dianliang.bringToFront();
+        tv_dianliang2.bringToFront();//���������������������
+        iv_dianliang.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FlipAnimatorXViewShow(iv_dianliang, tv_dianliang2, 200);
+            }
+        });
+        tv_dianliang2.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                FlipAnimatorXViewShow(tv_dianliang2, iv_dianliang, 200);
+
+            }
+        });
         showStatus(-1);
     }
 
@@ -303,7 +413,8 @@
     }
 
     private MaterialDialog clearDialog;
-    private  void showClear(){
+
+    private void showClear() {
         clearDialog = MaterialDialogUtils.showCallBaclDialog(getActivity(), "������������", "���������������������������������?", new MaterialDialog.SingleButtonCallback() {
             @Override
             public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
@@ -313,16 +424,16 @@
                 if (!MainApp.theApp.bleManager.isConnectingOrConnected()) {
                     return;
                 }
-                if(mBluetoothService==null){
+                if (mBluetoothService == null) {
                     return;
                 }
-                if(mBluetoothService.getWirteCharacteristic()==null){
+                if (mBluetoothService.getWirteCharacteristic() == null) {
                     return;
                 }
-                if(mBluetoothService.getWirteCharacteristic().getService()==null){
+                if (mBluetoothService.getWirteCharacteristic().getService() == null) {
                     return;
                 }
-                mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(),mBluetoothService.getWirteCharacteristic().getUuid().toString(),BLECommon.BLE_CLEAR,null);
+                mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_CLEAR, null);
                 clearDialog.dismiss();
             }
         }, new MaterialDialog.SingleButtonCallback() {
@@ -350,7 +461,7 @@
                 startActivity(intent);
                 break;
             case R.id.iv_search:
-               showClear();
+                showClear();
                 break;
         }
 
@@ -433,7 +544,7 @@
                     message.what = 1;
                     heartHandler.sendMessage(message);
                 }
-            }, 0, 1000 * 10);
+            }, 0, 1000 * 30);
         }
     }
 
@@ -448,27 +559,6 @@
                     heartHandler.sendMessage(message);
                 }
             }, 0, 1000 * 8);
-        }
-    }
-
-    private long timeComplete = 0;
-
-    private void checkResComplete(final String result) {
-        if (resTimer == null) {
-            resTimer = new Timer();
-            resTimer.schedule(new TimerTask() {
-                @Override
-                public void run() {
-                    if (!TextUtils.isEmpty(result) && result.startsWith("3A")) {
-                        timeComplete = 0;
-                    } else {
-                        timeComplete++;
-                    }
-                    if (timeComplete >= 120) {
-                        submitResData();
-                    }
-                }
-            }, 0, 1000);
         }
     }
 
@@ -487,11 +577,9 @@
         up.setLon(MainApp.mLon);
         up.setData(submitTempResult);
         params.put("data", FastJsonTools.toJson(up));
-//        Log.d("haijiang","###################" + FastJsonTools.toJson(up));
         HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
             @Override
             public void onSuccess(String res, String msg) {
-                XLog.d("@@@@@@@@@@@@@@@@@@@@@@@@@@" + msg);
                 submitTempResult.clear();
             }
 
@@ -507,50 +595,28 @@
         });
     }
 
-    private void submitResData() {
-        //���������������������������
-        HashMap<String, String> params = new HashMap<>();
-        if (submitHisResult.size() == 0) {
-            return;
-        }
-        UpLoadParam up = new UpLoadParam();
-        up.setUserid(MainApp.userId);
-        up.setAddress(MainApp.address);
-        up.setLat(MainApp.mLat);
-        up.setLon(MainApp.mLon);
-        up.setData(submitHisResult);
-        params.put("data", FastJsonTools.toJson(up));
-        HttpUtils.doPost(API.UPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
-            @Override
-            public void onSuccess(String res, String msg) {
-                XLog.d("������������������������" + msg);
-                submitHisResult.clear();
-                if (resTimer != null) {
-                    resTimer.cancel();
-                    resTimer = null;
-                }
-            }
-
-            @Override
-            public void showLoadingDialog() {
-
-            }
-
-            @Override
-            public void onFail(int errno, String s) {
-
-            }
-        });
-
-
-    }
-
     /**
      * ������������������������������
      *
      * @param level
      */
     private void showStatus(int level) {
+        int yanzhang = R.mipmap.icon_yanzhong;
+        int danger = R.mipmap.icon_danger;
+        if (type == 1) {
+            //������
+            yanzhang = R.mipmap.dianliyanyang;
+            danger = R.mipmap.dianlidanger;
+            lv_ljjl.setVisibility(View.VISIBLE);
+            tvShishiTitle.setText("������������(uSv/h)");
+        } else if (type == 2) {
+            //������
+            yanzhang = R.mipmap.icon_yanzhong;
+            danger = R.mipmap.icon_danger;
+            tvShishiTitle.setText("������������(V/m)");
+            lv_ljjl.setVisibility(View.GONE);
+        }
+
         if (level == 0) {
             tv_tishi.setText("������������������");
             tv_tishi.setBackgroundResource(R.mipmap.bt_green);
@@ -573,18 +639,18 @@
             tv_tishi.setText("������������������");
             tv_tishi.setBackgroundResource(R.mipmap.bt_zise);
             iv_bottom_status.setImageResource(R.mipmap.icon_zhongdu);
-            tv_desc.setText("���������������������������\n������������������������������������������");
+            tv_desc.setText("���������������������������\n������������������������������������������");
             iv_status.setImageResource(R.mipmap.icon_head_zhongfu);
-            tv_status.setText("������");
+            tv_status.setText("������");
             tv_status.setTextColor(getResources().getColor(R.color.zi_txt));
             ll_status.setBackgroundResource(R.mipmap.bg_corner_zise);
         } else if (level == 3) {
             tv_tishi.setText("������������������");
             tv_tishi.setBackgroundResource(R.mipmap.bt_red);
-            iv_bottom_status.setImageResource(R.mipmap.icon_yanzhong);
-            tv_desc.setText("���������������������������\n������������������������������������������");
-            iv_status.setImageResource(R.mipmap.icon_danger);
-            tv_status.setText("������");
+            iv_bottom_status.setImageResource(yanzhang);
+            tv_desc.setText("���������������������������\n������������������������������������������");
+            iv_status.setImageResource(danger);
+            tv_status.setText("������");
             tv_status.setTextColor(getResources().getColor(R.color.red_txt));
             ll_status.setBackgroundResource(R.mipmap.bg_conner_red);
         } else if (level == -1) {
@@ -604,37 +670,117 @@
      *
      * @param result
      */
-    private void parseCurrentData(String result) {
-        if (result.startsWith("5A")) {
-            realResult.clear();
-            realResult.add(result);
-        } else {
-            realResult.add(result);
-        }
-        String nowResult = "";
-        for (String s : realResult) {
-            nowResult += s;
-        }
-//        Log.d("haijiang", "������������===nowResult=" + nowResult);
-        /**
-         * 20������������5A������  5B������
-         */
+    private int preLevel = -1;
+
+
+    /**
+     * data : 5A160000FA1C0400004100E7000700000071005B
+     * format : 20������������5A������  5B������
+     * 5A������������������
+     *
+     * @param nowResult
+     */
+    //todo ������������������
+    private void parseCurrentData(String nowResult) {
+        type = 1;
         if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 40 && nowResult.startsWith("5A") && nowResult.endsWith("5B")) {
-            int shunshiValue = Integer.parseInt(nowResult.substring(24, 26), 16) * 256 + Integer.parseInt(nowResult.substring(26, 28), 16);
+            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);
-//            float level = (float) (shunshiValue / 10 * 0.01);
             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.001, 3) + "");
-            double shishiValue = NumberUtils.getBigDecimalValue((shunshiValue) / 100.0, 3);
-            tv_shishi.setText(shishiValue + "");
+            tv_ljjl.setText(NumberUtils.getBigDecimalValue(leijiValue * 0.01, 3) + "");
+            double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
+            tv_shishi.setText(realValue + "");
 
             /**
              * ���������������������
              */
             RecData data = new RecData();
-            data.setValue(shishiValue);
+            data.setValue(realValue);
+            data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
+            data.setType(0);
+
+            /**
+             * ������������
+             */
+            showPower(b1, b2);
+
+            if (realValue < 0.16) {
+                data.setIs_warn(0);
+                pv.setPercent((float) (realValue * (0.25 / 0.16)));
+                showStatus(0);
+                stop();
+                if (isVirating) {
+                    isVirating = false;
+                    AudioUtils.virateCancle(getActivity());
+                }
+                preLevel = -1;
+            } else if (realValue >= 0.16 && realValue < 0.8) {
+                data.setIs_warn(1);
+                pv.setPercent((float) (0.25 + realValue * (0.25 / 0.8)));
+                showStatus(1);
+                play(0);
+                if (!isVirating) {
+                    isVirating = true;
+                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+                }
+            } else if (realValue >= 0.8 && realValue < 2) {
+                data.setIs_warn(1);
+                showStatus(2);
+                pv.setPercent((float) (0.5 + realValue * (0.25 / 2)));
+                play(1);
+                if (!isVirating) {
+                    isVirating = true;
+                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+                }
+            } else if (realValue >= 2) {
+                data.setIs_warn(1);
+                showStatus(3);
+                if ((0.75 + realValue / 30) < 1.0) {
+                    pv.setPercent((float) (0.75 + realValue / 30));
+                } else {
+                    pv.setPercent(1.0f);
+                }
+                play(2);
+                if (!isVirating) {
+                    isVirating = true;
+                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+                }
+            }
+
+            submitResult.add(data);
+//            realResult.clear();
+        }
+    }
+
+    /**
+     * 7A������������������
+     * 7A0024010002D8B04CE90E6300000003000003EE0000000000000EC6000000000017347B0D0A
+     * ������������������
+     */
+    private void parseHoutData(String nowResult) {
+        if (TextUtils.isEmpty(nowResult)) {
+            return;
+        }
+        type = 2;
+        String[] strings = StringUtils.splitString(nowResult, 2);
+        if (strings[0].startsWith("7A") && strings[35].endsWith("7B")) {
+            String realString = StringUtils.subStrings(strings, 21, 23);
+            int real = Integer.parseInt(realString, 16);
+            int b1 = Integer.parseInt(strings[24], 16);
+            int b2 = Integer.parseInt(strings[25], 16);
+            double realValue = NumberUtils.getBigDecimalValue((real) / 100.0, 3);
+            String power = StringUtils.subStrings(strings, 26, 27);
+            double textPower = Integer.parseInt(power, 16) / 1000.0;
+            tv_dianliang2.setText(textPower + "V");
+            tv_shishi.setText(realValue + "");
+
+            /**
+             * ���������������������
+             */
+            RecData data = new RecData();
+            data.setValue(realValue);
             data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
             data.setType(0);
 
@@ -642,104 +788,70 @@
             /**
              * ������������
              */
-            if (b1 == 1) {
-                ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
-            } else if (b1 == 2) {
-                ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_full, iv_dianliang);
-            } else {
-                if (b2 == 0) {
-                    ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b00, iv_dianliang);
-                } else if (b2 == 1) {
-                    ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b01, iv_dianliang);
-                } else if (b2 == 2) {
-                    ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b02, iv_dianliang);
-                } else if (b2 == 3) {
-                    ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b03, iv_dianliang);
-                } else if (b2 == 4) {
-                    ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b04, iv_dianliang);
-                }
-            }
+            showPower(b1, b2);
+            showStatus(Integer.parseInt(strings[21], 16));
 
-            if (shishiValue < 0.16) {
+            if (realValue < 0.16) {
                 data.setIs_warn(0);
-                pv.setPercent((float) (shishiValue * (0.25 / 0.16)));
+                pv.setPercent((float) (realValue * (0.25 / 0.16)));
                 showStatus(0);
                 stop();
-            } else if (shishiValue >= 0.16 && shishiValue < 0.8) {
+                if (isVirating) {
+                    isVirating = false;
+                    AudioUtils.virateCancle(getActivity());
+                }
+                preLevel = -1;
+            } else if (realValue >= 0.16 && realValue < 0.8) {
                 data.setIs_warn(1);
-                pv.setPercent((float) (0.25 + shishiValue * (0.25 / 0.8)));
+                pv.setPercent((float) (0.25 + realValue * (0.25 / 0.8)));
                 showStatus(1);
                 play(0);
-            } else if (shishiValue >= 0.8 && shishiValue < 2) {
+                if (!isVirating) {
+                    isVirating = true;
+                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+                }
+            } else if (realValue >= 0.8 && realValue < 2) {
                 data.setIs_warn(1);
                 showStatus(2);
-                pv.setPercent((float) (0.5 + shishiValue * (0.25 / 2)));
+                pv.setPercent((float) (0.5 + realValue * (0.25 / 2)));
                 play(1);
-            } else if (shishiValue >= 2) {
+                if (!isVirating) {
+                    isVirating = true;
+                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+                }
+            } else if (realValue >= 2) {
                 data.setIs_warn(1);
                 showStatus(3);
-                if ((0.75 + shishiValue / 30) < 1.0) {
-                    pv.setPercent((float) (0.75 + shishiValue / 30));
+                if ((0.75 + realValue / 30) < 1.0) {
+                    pv.setPercent((float) (0.75 + realValue / 30));
                 } else {
                     pv.setPercent(1.0f);
                 }
                 play(2);
+                if (!isVirating) {
+                    isVirating = true;
+                    AudioUtils.vibrate(getActivity(), new long[]{1000, 1000, 1000, 1000}, 0);
+                }
             }
             submitResult.add(data);
-            realResult.clear();
-        }
-    }
-
-    /**
-     * ������������������
-     *
-     * @param result
-     */
-    private void parseHoutData(String result) {
-        if (result.startsWith("7A")) {
-            realHourResult.clear();
-            realHourResult.add(result);
-        } else {
-            realHourResult.add(result);
-        }
-        String nowResult = "";
-        for (String s : realHourResult) {
-            nowResult += s;
-        }
-        if (!TextUtils.isEmpty(nowResult)&& nowResult.length() == 8&&nowResult.startsWith("7A") && nowResult.endsWith("7B")) {
-            int hourValue = Integer.parseInt(nowResult.substring(2, 4), 16) * 256 + Integer.parseInt(nowResult.substring(4, 6), 16);
-            Log.d("haijiang", "������������������������="+ nowResult+"���������"+nowResult.substring(2, 4)+"|"+Integer.parseInt(nowResult.substring(2, 4), 16) * 256+"���������"+nowResult.substring(4, 6)+"|"+Integer.parseInt(nowResult.substring(4, 6), 16) +"���������"+(hourValue/100.0));
-            sendHourDataRec();
-            RecData data = new RecData();
-            data.setType(1);
-            data.setIs_warn(0);
-            data.setTime(TimeUtil.getCurrentDate("yyyy-MM-dd HH:mm:ss"));
-            data.setValue(hourValue / 100.0);
-            ArrayList<RecData> temp = new ArrayList<>();
-            temp.add(data);
-            submitHourData(temp);
+//            realResult.clear();
         }
     }
 
     /**
      * ���������������������������������
      */
-    private void parseHisData(String result) {
-        if (result.startsWith("3A")) {
-            realHisResult.clear();
-            realHisResult.add(result);
-        } else {
-            realHisResult.add(result);
-        }
-        String nowResult = "";
-        for (String s : realHisResult) {
-            nowResult += s;
-        }
+    private void parseHisData(String nowResult) {
         if (!TextUtils.isEmpty(nowResult) && nowResult.length() == 16 && nowResult.startsWith("3A") && nowResult.endsWith("3B")) {
-            if (submitHisResult.size() == 0) {
-                //���������������������
-                checkResComplete(result);
+            Log.d("hourdata", "=====nowResult=====" + nowResult);
+
+            if (DebugUtils.debug_mode) {
+                //-----------------------Test------------------------------------------//
+                String aaa = MainApp.theApp.sharedPreferencesUtil.getTest() + "\n" + nowResult;
+                MainApp.theApp.sharedPreferencesUtil.saveTest(aaa);
+                //-----------------------Test------------------------------------------//
             }
+
             String year = "20" + Integer.parseInt(nowResult.substring(2, 4), 16);
             String month = Integer.parseInt(nowResult.substring(4, 6), 16) + "";
             String day = Integer.parseInt(nowResult.substring(6, 8), 16) + "";
@@ -749,10 +861,39 @@
             StringBuilder time = new StringBuilder();
             //yyyy-MM-dd HH:mm:ss
             time.append(year).append("-").append(month).append("-").append(day).append(" ").append(hour).append(":00:00");
-            Log.d("haijiang", "=====time=====" + time.toString());
             data.setTime(time.toString());
             data.setValue(NumberUtils.getBigDecimalValue((resValue) / 100.0, 3));
-            submitHisResult.add(data);
+            data.setType(1);
+            data.setIs_warn(0);
+
+            ArrayList<RecData> temp = new ArrayList<>();
+            temp.add(data);
+            Log.d("hourdata", "=====hourdata=====" + FastJsonTools.toJson(temp));
+            test(nowResult, time.toString());
+            submitHourData(temp);
+        }
+    }
+
+    /**
+     * ������������
+     */
+    private void showPower(int b1, int b2) {
+        if (b1 == 1) {
+            ImageLoader.setGIFByUrl(getActivity(), R.mipmap.icon_chong, iv_dianliang);
+        } else if (b1 == 2) {
+            ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_full, iv_dianliang);
+        } else {
+            if (b2 == 0) {
+                ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b00, iv_dianliang);
+            } else if (b2 == 1) {
+                ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b01, iv_dianliang);
+            } else if (b2 == 2) {
+                ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b02, iv_dianliang);
+            } else if (b2 == 3) {
+                ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b03, iv_dianliang);
+            } else if (b2 == 4) {
+                ImageLoader.setImageViewById(getActivity(), R.mipmap.icon_b04, iv_dianliang);
+            }
         }
     }
 
@@ -775,7 +916,24 @@
         blesb.append(toHex(Integer.toHexString((now.get(Calendar.HOUR_OF_DAY)))));
         blesb.append(toHex(Integer.toHexString((now.get(Calendar.MINUTE)))));
         blesb.append("4B");
-        mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), blesb.toString(), null);
+
+        boolean result = mBluetoothService.write(mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), mBluetoothService.getWirteCharacteristic().getUuid().toString(), blesb.toString(), new BleCharacterCallback() {
+            @Override
+            public void onSuccess(BluetoothGattCharacteristic characteristic) {
+                String val = StringUtils.byteArrayToHexStr(characteristic.getValue());
+                DebugUtils.sendData("time", val);
+            }
+
+            @Override
+            public void onFailure(BleException exception) {
+            }
+
+            @Override
+            public void onInitiatedResult(boolean result) {
+                //DebugUtils.sendData("time", String.valueOf(result));
+            }
+        });
+        DebugUtils.sendData("time", String.valueOf(result));
     }
 
     private String toHex(String s) {
@@ -787,6 +945,11 @@
     }
 
     public void play(int level) {
+        Log.d("music", "preLevel:" + preLevel + "----level:" + level);
+        if (preLevel == level) {
+            return;
+        }
+        preLevel = level;
         if (mp != null) {
             stop();
         }
@@ -794,12 +957,14 @@
         if (voiceBean.isDefaultMusic()) {
             mp = MediaPlayer.create(getActivity(), Uri.parse(voiceBean.getRes()));
             mp.start();
+            mp.setLooping(true);
         } else {
             mp = new MediaPlayer();
             try {
                 mp.setDataSource(voiceBean.getSetMusic());
                 mp.prepare();
                 mp.start();
+                mp.setLooping(true);
             } catch (IOException e) {
                 e.printStackTrace();
             }
@@ -829,10 +994,40 @@
             @Override
             public void onSuccess(String res, String msg) {
                 XLog.d("������������������������������" + msg);
-                if (resTimer != null) {
-                    resTimer.cancel();
-                    resTimer = null;
-                }
+//                if (resTimer != null) {
+//                    resTimer.cancel();
+//                    resTimer = null;
+//                }
+            }
+
+            @Override
+            public void showLoadingDialog() {
+
+            }
+
+            @Override
+            public void onFail(int errno, String s) {
+
+            }
+        });
+    }
+
+    /**
+     * ������������������
+     *
+     * @param data
+     * @param time
+     */
+    private void test(String data, String time) {
+        //���������������������������
+        HashMap<String, String> params = new HashMap<>();
+        params.put("data", data);
+        params.put("time", time);
+        params.put("user_id", MainApp.userId);
+        HttpUtils.doPost(API.ORIGINALUPLOAD, params, CacheMode.DEFAULT, false, new HttpCallBack() {
+            @Override
+            public void onSuccess(String res, String msg) {
+                Log.d("hourdata", "������������");
             }
 
             @Override
@@ -850,7 +1045,7 @@
     /**
      * ������������������
      */
-    private void  sendHourDataRec(){
+    private void sendHourDataRec() {
         if (MainApp.theApp.bleManager == null) {
             return;
         }
@@ -868,4 +1063,36 @@
         }
         FragmentMonitor.this.mBluetoothService.write(FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getService().getUuid().toString(), FragmentMonitor.this.mBluetoothService.getWirteCharacteristic().getUuid().toString(), BLECommon.BLE_HOUR_REC, null);
     }
+
+    public static void FlipAnimatorXViewShow(final View oldView, final View newView, final long time) {
+
+        ObjectAnimator animator1 = ObjectAnimator.ofFloat(oldView, "rotationX", 0, 90);
+        final ObjectAnimator animator2 = ObjectAnimator.ofFloat(newView, "rotationX", -90, 0);
+        animator2.setInterpolator(new OvershootInterpolator(2.0f));
+
+        animator1.addListener(new Animator.AnimatorListener() {
+            @Override
+            public void onAnimationStart(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                oldView.setVisibility(View.GONE);
+                animator2.setDuration(time).start();
+                newView.setVisibility(View.VISIBLE);
+            }
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+
+            }
+
+            @Override
+            public void onAnimationRepeat(Animator animation) {
+
+            }
+        });
+        animator1.setDuration(time).start();
+    }
 }

--
Gitblit v1.8.0