From e91af284643d5e370b0d18c384fe8de65f59d9b3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 24 九月 2020 12:01:10 +0800
Subject: [PATCH] 2020-09-24 1.修改MQTTSDK引用方式,修复闪退问题。

---
 Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java |  294 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
index 5420b7b..ebdcc53 100644
--- a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
+++ b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -84,7 +84,6 @@
     }
 
 
-
 //    /**
 //     * 鑾峰彇鏈湴骞挎挱IP
 //     * @return
@@ -95,15 +94,17 @@
 
     /**
      * 鑾峰彇鏈湴骞挎挱IP
+     *
      * @return
      */
-    public static String getLocalBroadCastIp(){
+    public static String getLocalBroadCastIp() {
         return NetWorkUtil.getLocalBroadCast();
     }
 
     /**
      * 鏄惁寮�鍚疭DK鏃ュ織鎵撳嵃
      * 2019-07-10鏂板
+     *
      * @param bOpen
      */
     public static void setHDLLogOpen(boolean bOpen) {
@@ -123,7 +124,6 @@
 //    }
 
 
-
     /**
      * 鑾峰彇RCU妯″潡鐨勮澶�
      *
@@ -138,14 +138,13 @@
     }
 
 
-
     /**
      * 鑾峰彇瀹跺眳璁惧
      *
      * @param context
      */
-    public static void getHomeDevices(Context context ,Boolean isZigbee) {
-        HandleSearch.getHomeDevices(context,isZigbee);
+    public static void getHomeDevices(Context context, Boolean isZigbee) {
+        HandleSearch.getHomeDevices(context, isZigbee);
     }
 
 //    public static void cancelSearching(){
@@ -173,31 +172,31 @@
      * @param info
      * @param state
      */
-    public static void lightCtrl(final AppliancesInfo info, int state,boolean isZigbee) {
-        if (isZigbee){
-            if (statusReadBackBean != null){
-                if (info.getBigType() == Configuration.LIGTH_BIG_TYPE  && info.getLittleType() == 1){//缁х數鍣� 寮�鍏�
-                    if (statusReadBackBean.getValue() == Configuration.RELAY_ON){
-                        HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.OnOffOutput,Configuration.RELAY_OFF);
-                    }else {
-                        HDLCommandText.sendStatus(zigbeeDeviceBean,ZigbeeDeviceID.OnOffOutput,Configuration.RELAY_ON);
+    public static void lightCtrl(final AppliancesInfo info, int state, boolean isZigbee) {
+        if (isZigbee) {
+            if (statusReadBackBean != null) {
+                if (info.getBigType() == Configuration.LIGTH_BIG_TYPE && info.getLittleType() == 1) {//缁х數鍣� 寮�鍏�
+                    if (statusReadBackBean.getValue() == Configuration.RELAY_ON) {
+                        HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.OnOffOutput, Configuration.RELAY_OFF);
+                    } else {
+                        HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.OnOffOutput, Configuration.RELAY_ON);
                     }
                 }
-                if (info.getBigType() == Configuration.LIGTH_BIG_TYPE  && info.getLittleType() == 0){//璋冨厜鍣� 寮�鍒板浐瀹氱殑鍊兼垨鑰呭紑鍒�0
+                if (info.getBigType() == Configuration.LIGTH_BIG_TYPE && info.getLittleType() == 0) {//璋冨厜鍣� 寮�鍒板浐瀹氱殑鍊兼垨鑰呭紑鍒�0
                     int value = (int) (state * 2.55);
-                    if (statusReadBackBean.getValue()!=0){
+                    if (statusReadBackBean.getValue() != 0) {
                         //lightStatus = 0;
-                        HDLCommandText.sendStatus(zigbeeDeviceBean,ZigbeeDeviceID.DimmableLight,0);
-                    }else {
+                        HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.DimmableLight, 0);
+                    } else {
                         //lightStatus = value;
-                        HDLCommandText.sendStatus(zigbeeDeviceBean,ZigbeeDeviceID.DimmableLight,value);
+                        HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.DimmableLight, value);
                     }
                 }
-            }else {
+            } else {
                 HDLLog.info("涓鸿幏鍙栧埌璁惧鐘舵��");
             }
 
-        }else {
+        } else {
             //        HDLDeviceManager.isLightCtrlSuccess = false;
             HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
             if (lightCtrlFailTimer != null) {
@@ -261,23 +260,23 @@
      * @param info
      * @param state 璋冩暣鐨勫��
      */
-    public static void curtainCtrl(final AppliancesInfo info, int state,boolean isZigbee) {
-        if (isZigbee){
-            switch (state){
-                case  CurtainCtrlParser.curtainOn:
-                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean,ZigbeeDeviceID.WindowCoveringDevice,0,0);//value = 0涓哄紑锛宼ag = 0涓烘爣璁版帶鍒�
+    public static void curtainCtrl(final AppliancesInfo info, int state, boolean isZigbee) {
+        if (isZigbee) {
+            switch (state) {
+                case CurtainCtrlParser.curtainOn:
+                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean, ZigbeeDeviceID.WindowCoveringDevice, 0, 0);//value = 0涓哄紑锛宼ag = 0涓烘爣璁版帶鍒�
                     break;
-                case  CurtainCtrlParser.curtainOff:
-                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean,ZigbeeDeviceID.WindowCoveringDevice,1,0);//value = 1涓哄叧锛宼ag = 0涓烘爣璁版帶鍒�
+                case CurtainCtrlParser.curtainOff:
+                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean, ZigbeeDeviceID.WindowCoveringDevice, 1, 0);//value = 1涓哄叧锛宼ag = 0涓烘爣璁版帶鍒�
                     break;
                 case CurtainCtrlParser.curtainPause:
-                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean,ZigbeeDeviceID.WindowCoveringDevice,2,0);//value = 2涓烘殏鍋滐紝tag = 0涓烘爣璁版帶鍒�
+                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean, ZigbeeDeviceID.WindowCoveringDevice, 2, 0);//value = 2涓烘殏鍋滐紝tag = 0涓烘爣璁版帶鍒�
                     break;
                 default:
-                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean,ZigbeeDeviceID.WindowCoveringDevice,state,1);//value = state涓鸿皟鏁存暟鍊硷紝tag = 1涓烘爣璁版暟鍊兼帶鍒�
+                    HDLCommandText.sendCurtainStatus(zigbeeDeviceBean, ZigbeeDeviceID.WindowCoveringDevice, state, 1);//value = state涓鸿皟鏁存暟鍊硷紝tag = 1涓烘爣璁版暟鍊兼帶鍒�
                     break;
             }
-        }else {
+        } else {
             HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
             if (curtainCtrlFailTimer != null) {
                 curtainCtrlFailTimer.cancel();
@@ -336,69 +335,69 @@
      * @param type
      * @param state
      */
-    public static void airCtrl(final AppliancesInfo info, int type, int state , boolean isZigbee) {
-        if (isZigbee){
-            switch (type){
+    public static void airCtrl(final AppliancesInfo info, int type, int state, boolean isZigbee) {
+        if (isZigbee) {
+            switch (type) {
                 case AirCtrlParser.airSwich:
                     //寮�鍏抽�夋嫨
-                    switch (state){
+                    switch (state) {
                         case AirCtrlParser.airOn://绌鸿皟寮�
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,1,0,0);//value = 1涓虹┖璋冨紑 tag = 0涓烘爣蹇椾负寮�鍏虫帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 1, 0, 0);//value = 1涓虹┖璋冨紑 tag = 0涓烘爣蹇椾负寮�鍏虫帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airOff://绌鸿皟鍏�
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,0,0,0);//value = 0涓虹┖璋冨紑 tag = 0涓烘爣蹇椾负寮�鍏虫帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 0, 0, 0);//value = 0涓虹┖璋冨紑 tag = 0涓烘爣蹇椾负寮�鍏虫帶鍒� mode蹇界暐
                             break;
                     }
                     break;
                 case AirCtrlParser.airMode:
                     //鎭掓俯鍣ㄦā寮忛�夋嫨
-                    switch (state){
+                    switch (state) {
                         case AirCtrlParser.airModeHeatTem://绌鸿皟妯″紡鍒剁儹
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,4,1,0);//value = 4涓烘亽娓╁櫒鍒剁儹 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 4, 1, 0);//value = 4涓烘亽娓╁櫒鍒剁儹 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airModeVen://绌鸿皟妯″紡閫氶
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,7,1,0);//value = 7涓烘亽娓╁櫒閫氶 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 7, 1, 0);//value = 7涓烘亽娓╁櫒閫氶 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airModeAuto://绌鸿皟妯″紡鑷姩
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,1,1,0);//value = 1涓烘亽娓╁櫒鑷姩 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 1, 1, 0);//value = 1涓烘亽娓╁櫒鑷姩 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airModeDehum://绌鸿皟妯″紡鎶芥箍
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,8,1,0);//value = 8涓烘亽娓╁櫒鎶芥箍 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 8, 1, 0);//value = 8涓烘亽娓╁櫒鎶芥箍 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airModeRefTem://绌鸿皟妯″紡鍒跺喎
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,3,1,0);//value = 3涓烘亽娓╁櫒鍒跺喎 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 3, 1, 0);//value = 3涓烘亽娓╁櫒鍒跺喎 tag = 1涓烘爣蹇椾负鎭掓俯鍣ㄦ帶鍒� mode蹇界暐
                             break;
                     }
                     break;
                 case AirCtrlParser.airSpeed:
                     //椋庨�熸ā寮忛�夋嫨
-                    switch (state){
+                    switch (state) {
                         case AirCtrlParser.airSpeedHigh://椋庨�熼珮椋�
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,3,2,0);//value = 3涓洪閫熼珮椋� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 3, 2, 0);//value = 3涓洪閫熼珮椋� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airSpeedMid://椋庨�熶腑椋�
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,2,2,0);//value = 2涓洪閫熶腑椋� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 2, 2, 0);//value = 2涓洪閫熶腑椋� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airSpeedLow://椋庨�熶綆椋�
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,1,2,0);//value = 1涓洪閫熶綆椋� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 1, 2, 0);//value = 1涓洪閫熶綆椋� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
                             break;
                         case AirCtrlParser.airSpeedAuto://椋庨�熻嚜鍔�
-                            HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,5,2,0);//value = 5涓洪閫熻嚜鍔� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
+                            HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, 5, 2, 0);//value = 5涓洪閫熻嚜鍔� tag = 2涓烘爣蹇椾负椋庨�熸帶鍒� mode蹇界暐
                             break;
                     }
                     break;
                 case AirCtrlParser.dehumTem://褰撳墠绌鸿皟妯″紡涓烘娊婀�
                 case AirCtrlParser.refTem: //褰撳墠绌鸿皟妯″紡涓哄埗鍐�
-                    HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,state,3,1);//value = state涓烘俯搴﹀�� tag = 3涓烘爣蹇椾负娓╁害鎺у埗 mode = 1涓哄埗鍐�
+                    HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, state, 3, 1);//value = state涓烘俯搴﹀�� tag = 3涓烘爣蹇椾负娓╁害鎺у埗 mode = 1涓哄埗鍐�
                     break;
                 case AirCtrlParser.heatTem://褰撳墠绌鸿皟妯″紡涓哄埗鐑�
-                    HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,state,3,0);//value = state涓烘俯搴﹀�� tag = 3涓烘爣蹇椾负娓╁害鎺у埗 mode = 0涓哄埗鐑�
+                    HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, state, 3, 0);//value = state涓烘俯搴﹀�� tag = 3涓烘爣蹇椾负娓╁害鎺у埗 mode = 0涓哄埗鐑�
                     break;
                 case AirCtrlParser.autoTem://褰撳墠绌鸿皟妯″紡涓鸿嚜鍔�
-                    HDLCommandText.sendAirStatus(zigbeeDeviceBean,ZigbeeDeviceID.Thermostat,state,3,2);//value = state涓烘俯搴﹀�� tag = 3涓烘爣蹇椾负娓╁害鎺у埗 mode = 2涓鸿嚜鍔�
+                    HDLCommandText.sendAirStatus(zigbeeDeviceBean, ZigbeeDeviceID.Thermostat, state, 3, 2);//value = state涓烘俯搴﹀�� tag = 3涓烘爣蹇椾负娓╁害鎺у埗 mode = 2涓鸿嚜鍔�
                     break;
             }
-        }else {
+        } else {
             //        HDLDeviceManager.isACCtrlSuccess = false;
             HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
             if (acCtrlFailTimer != null) {
@@ -451,32 +450,32 @@
      * @param type
      * @param state 2019-07-09
      */
-    public static void freshAirCtrl(final AppliancesInfo info, int type, int state,boolean isZigbee) {
-        if (isZigbee){
-            switch (type){
+    public static void freshAirCtrl(final AppliancesInfo info, int type, int state, boolean isZigbee) {
+        if (isZigbee) {
+            switch (type) {
                 case FreshAirParser.freshAirSwich:
-                switch (state){
-                    case  FreshAirParser.freshAirOn:
-                        HDLCommandText.sendStatus(zigbeeDeviceBean,ZigbeeDeviceID.AirPanel,1);//value = 1涓烘柊椋庡紑
-                        break;
-                    case  FreshAirParser.freshAirOff:
-                        HDLCommandText.sendStatus(zigbeeDeviceBean,ZigbeeDeviceID.AirPanel,0);//value = 0涓烘柊椋庡叧
-                        break;
-                }
-                break;
+                    switch (state) {
+                        case FreshAirParser.freshAirOn:
+                            HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.AirPanel, 1);//value = 1涓烘柊椋庡紑
+                            break;
+                        case FreshAirParser.freshAirOff:
+                            HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.AirPanel, 0);//value = 0涓烘柊椋庡叧
+                            break;
+                    }
+                    break;
                 case FreshAirParser.freshAirSpeed://楂橀銆佷綆椋�
-                    switch (state){
+                    switch (state) {
                         case FreshAirParser.freshAirSpeedMid://鎺у埗鎴愰珮椋�
-                            HDLCommandText.sendStatus(zigbeeDeviceBean,ZigbeeDeviceID.AirPanel,3);//value = 3涓烘柊椋庨珮椋�
+                            HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.AirPanel, 3);//value = 3涓烘柊椋庨珮椋�
                             break;
                         case FreshAirParser.freshAirSpeedLow://鎺у埗鎴愪綆閫�
                         case FreshAirParser.freshAirSpeedOff:
-                            HDLCommandText.sendStatus(zigbeeDeviceBean,ZigbeeDeviceID.AirPanel,1);//value = 1涓烘柊椋庝綆椋�
+                            HDLCommandText.sendStatus(zigbeeDeviceBean, ZigbeeDeviceID.AirPanel, 1);//value = 1涓烘柊椋庝綆椋�
                             break;
                     }
                     break;
             }
-        }else {
+        } else {
             //        HDLDeviceManager.isFreshAirCtrlSuccess = false;
             HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
             if (freshAirCtrlFailTimer != null) {
@@ -513,10 +512,10 @@
      *
      * @param info
      */
-    public static void logicCtrl(final AppliancesInfo info,final boolean isZigbee) {
-        if (isZigbee){
-                HDLCommandText.sendSceneStatus(zigbeeSceneBean.getScenesId(),0);//鎺у埗鍦烘櫙鐨刬d锛屽欢鏃舵椂闂翠负0
-        }else {
+    public static void logicCtrl(final AppliancesInfo info, final boolean isZigbee) {
+        if (isZigbee) {
+            HDLCommandText.sendSceneStatus(zigbeeSceneBean.getScenesId(), 0);//鎺у埗鍦烘櫙鐨刬d锛屽欢鏃舵椂闂翠负0
+        } else {
             //        HDLDeviceManager.isSceneCtrlSuccess = false;
             HDLDeviceManager.setDeviceCtrlSuccessStateWithInfo(info, false);
 
@@ -678,16 +677,17 @@
 //        }, 5000);
 //
 //    }
+
     /**
      * 鑾峰彇鍗曚竴璁惧鐘舵��
      */
-    public static void getDeviceState(Context context,final AppliancesInfo appliancesInfo,boolean isZigbee) {
-        if (isZigbee){
-            zigbeeDeviceDatas = SPUtils.getZigbeeDeviceSaveBean(context,SPUtils.KEY_ZIGBEE_IP);
-            zigbeeSceneDatas = SPUtils.getZigbeeSceneSaveBean(context,SPUtils.KEY_ZIGBEE_SCENE_IP);
+    public static void getDeviceState(Context context, final AppliancesInfo appliancesInfo, boolean isZigbee) {
+        if (isZigbee) {
+            zigbeeDeviceDatas = SPUtils.getZigbeeDeviceSaveBean(context, SPUtils.KEY_ZIGBEE_IP);
+            zigbeeSceneDatas = SPUtils.getZigbeeSceneSaveBean(context, SPUtils.KEY_ZIGBEE_SCENE_IP);
             HDLCommandText hdlCommandText = new HDLCommandText();
-            for (ZigbeeDeviceSaveBean zigbeeDeviceSaveBean : zigbeeDeviceDatas){
-                if (appliancesInfo.getBigType() == Configuration.LIGTH_BIG_TYPE && appliancesInfo.getLittleType() == 1){
+            for (ZigbeeDeviceSaveBean zigbeeDeviceSaveBean : zigbeeDeviceDatas) {
+                if (appliancesInfo.getBigType() == Configuration.LIGTH_BIG_TYPE && appliancesInfo.getLittleType() == 1) {
                     //缁х數鍣�
                     type = ZigbeeDeviceID.OnOffOutput;
                     if (zigbeeDeviceSaveBean.getmSubnetID() == appliancesInfo.getDeviceSubnetID() &&
@@ -701,7 +701,7 @@
                     }
                 }
 
-                if (appliancesInfo.getBigType() == Configuration.LIGTH_BIG_TYPE && appliancesInfo.getLittleType() == 0){
+                if (appliancesInfo.getBigType() == Configuration.LIGTH_BIG_TYPE && appliancesInfo.getLittleType() == 0) {
                     //璋冨厜鍣�
                     type = ZigbeeDeviceID.DimmableLight;
                     if (zigbeeDeviceSaveBean.getmSubnetID() == appliancesInfo.getDeviceSubnetID() &&
@@ -714,7 +714,7 @@
                         HDLCommandText.initStatus(zigbeeDeviceSaveBean, ZigbeeDeviceID.DimmableLight);
                     }
                 }
-                if (appliancesInfo.getBigType() == Configuration.CURTAIN_BIG_TYPE && appliancesInfo.getLittleType() == 0){
+                if (appliancesInfo.getBigType() == Configuration.CURTAIN_BIG_TYPE && appliancesInfo.getLittleType() == 0) {
                     //绐楀笜
                     type = ZigbeeDeviceID.WindowCoveringDevice;
                     if (zigbeeDeviceSaveBean.getmSubnetID() == appliancesInfo.getDeviceSubnetID() &&
@@ -727,7 +727,7 @@
                         HDLCommandText.initStatus(zigbeeDeviceSaveBean, ZigbeeDeviceID.WindowCoveringDevice);
                     }
                 }
-                if (appliancesInfo.getBigType() ==Configuration.AIR_BIG_TYPE && appliancesInfo.getLittleType() == 0){
+                if (appliancesInfo.getBigType() == Configuration.AIR_BIG_TYPE && appliancesInfo.getLittleType() == 0) {
                     //绌鸿皟
                     type = ZigbeeDeviceID.Thermostat;
                     if (zigbeeDeviceSaveBean.getmSubnetID() == appliancesInfo.getDeviceSubnetID() &&
@@ -740,7 +740,7 @@
                         HDLCommandText.initStatus(zigbeeDeviceSaveBean, ZigbeeDeviceID.Thermostat);
                     }
                 }
-                if (appliancesInfo.getBigType() ==Configuration.FRESH_AIR_BIG_TYPE && appliancesInfo.getLittleType() == 0){
+                if (appliancesInfo.getBigType() == Configuration.FRESH_AIR_BIG_TYPE && appliancesInfo.getLittleType() == 0) {
                     //鏂伴
                     type = ZigbeeDeviceID.AirPanel;
                     if (zigbeeDeviceSaveBean.getmSubnetID() == appliancesInfo.getDeviceSubnetID() &&
@@ -754,8 +754,8 @@
                     }
                 }
             }
-            for (ZigbeeSceneSaveBean zigbeeSceneSaveBean : zigbeeSceneDatas){
-                if (appliancesInfo.getBigType() == Configuration.GLOBAL_LOGIC_BIG_TYPE && appliancesInfo.getLittleType() == 0){
+            for (ZigbeeSceneSaveBean zigbeeSceneSaveBean : zigbeeSceneDatas) {
+                if (appliancesInfo.getBigType() == Configuration.GLOBAL_LOGIC_BIG_TYPE && appliancesInfo.getLittleType() == 0) {
                     //鍦烘櫙
                     type = ZigbeeDeviceID.SceneMark;
                     if (zigbeeSceneSaveBean.getSubnetId() == appliancesInfo.getDeviceSubnetID() &&
@@ -767,133 +767,133 @@
                     }
                 }
             }
-            Log.d("11113", "type: "+type);
+            Log.d("11113", "type: " + type);
             //璇诲啓鐘舵�佷俊鎭洖璋�
             HDLCommandText.setStateListener(new StateListener() {
                 @Override
                 public void onData(final StateEvent event) {
                     //涓婃姤zigbee鍥為淇℃伅
                     Log.d("11113", "zigbee 鍥為json:" + event.getJson());
-                    switch (type){
+                    switch (type) {
                         case ZigbeeDeviceID.OnOffOutput:
                             //缁х數鍣ㄨ澶囧洖璋�
                             statusReadBackBean = JsonUtil.parseJsonWithGson(event.getJson(), StatusReadBackBean.class);
-                            if (statusReadBackBean.getValue() == Configuration.RELAY_ON){
+                            if (statusReadBackBean.getValue() == Configuration.RELAY_ON) {
                                 //缁х數鍣ㄥ叧
                                 appliancesInfo.setCurState(0);
                                 EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo, true));
-                            }else {
+                            } else {
                                 //缁х數鍣ㄥ紑
                                 appliancesInfo.setCurState(100);
                                 EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo, true));
                             }
                             break;
-                         case ZigbeeDeviceID.WindowCoveringDevice:
-                             //绐楀笜璁惧鍥炶皟
-                             statusReadBackBean = JsonUtil.parseJsonWithGson(event.getJson(), StatusReadBackBean.class);
+                        case ZigbeeDeviceID.WindowCoveringDevice:
+                            //绐楀笜璁惧鍥炶皟
+                            statusReadBackBean = JsonUtil.parseJsonWithGson(event.getJson(), StatusReadBackBean.class);
                             appliancesInfo.setCurState(statusReadBackBean.getValue());
-                            EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo,true));
+                            EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo, true));
                             break;
                         case ZigbeeDeviceID.DimmableLight:
                             //璋冨厜鍣ㄨ澶�
                             statusReadBackBean = JsonUtil.parseJsonWithGson(event.getJson(), StatusReadBackBean.class);
-                            Log.d("2222", "鍥炶皟鏁版嵁: "+statusReadBackBean.getValue());
+                            Log.d("2222", "鍥炶皟鏁版嵁: " + statusReadBackBean.getValue());
                             appliancesInfo.setCurState(statusReadBackBean.getValue());
-                            EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo,true));
+                            EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo, true));
                             break;
                         case ZigbeeDeviceID.Thermostat:
                             //娓╁害璁惧
-                            thermostatReadBean = JsonUtil.parseJsonWithGson(event.getJson(),StatusThermostatReadBean.class);
+                            thermostatReadBean = JsonUtil.parseJsonWithGson(event.getJson(), StatusThermostatReadBean.class);
                             int fanMode = thermostatReadBean.getFanmode(); //鏂伴妯″紡 0锛歄ff銆�1锛歀ow銆�2锛歁edium銆�3锛欻igh銆�4锛歄n銆�5锛欰uto銆�6锛歋mart
                             int thermostatMode = thermostatReadBean.getThermostatmode();//鎭掓俯妯″紡 0锛歄ff銆�1锛欰uto銆�3锛欳ool銆�4锛欻eat銆�5锛欵mergency heating銆�6锛歅recooling銆�7锛欶an only銆�8锛欴ry銆�9锛歋leep锛�
                             int coolingSetpoint = thermostatReadBean.getCoolingSetpoint();//鍒跺喎娓╁害
                             int heatingSetpoint = thermostatReadBean.getHeatingSetpoint();//鍒剁儹娓╁害
                             int tag = thermostatReadBean.getTag();
-                            switch (tag){
+                            switch (tag) {
                                 case 0://寮�鍏虫ā寮忚繑鍥�
-                                    if (fanMode == 0 && thermostatMode == 0){
-                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich,AirCtrlParser.airOff)); //绌鸿皟鍏�
-                                    }else {
-                                       appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich,AirCtrlParser.airOn));//绌鸿皟寮�
+                                    if (fanMode == 0 && thermostatMode == 0) {
+                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich, AirCtrlParser.airOff)); //绌鸿皟鍏�
+                                    } else {
+                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich, AirCtrlParser.airOn));//绌鸿皟寮�
                                     }
                                     break;
                                 case 1://鎭掓俯鍣ㄦā寮忚繑鍥�
-                                        if (fanMode ==0 && thermostatMode == 0){
-                                            appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich,AirCtrlParser.airOff));//绌鸿皟鍏�
-                                        }else {
-                                            switch (thermostatMode){
-                                                case 1://鑷姩妯″紡
-                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode,AirCtrlParser.airModeAuto));
-                                                    break;
-                                                case 3://鍒跺喎妯″紡
-                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode,AirCtrlParser.airModeRefTem));
-                                                    break;
-                                                case 4://鍒剁儹妯″紡
-                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode,AirCtrlParser.airModeHeatTem));
-                                                    break;
-                                                case 7://閫氶妯″紡
-                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode,AirCtrlParser.airModeVen));
-                                                    break;
-                                                case 8://鎶芥箍妯″紡
-                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode,AirCtrlParser.airModeDehum));
-                                                    break;
-                                            }
+                                    if (fanMode == 0 && thermostatMode == 0) {
+                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich, AirCtrlParser.airOff));//绌鸿皟鍏�
+                                    } else {
+                                        switch (thermostatMode) {
+                                            case 1://鑷姩妯″紡
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode, AirCtrlParser.airModeAuto));
+                                                break;
+                                            case 3://鍒跺喎妯″紡
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode, AirCtrlParser.airModeRefTem));
+                                                break;
+                                            case 4://鍒剁儹妯″紡
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode, AirCtrlParser.airModeHeatTem));
+                                                break;
+                                            case 7://閫氶妯″紡
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode, AirCtrlParser.airModeVen));
+                                                break;
+                                            case 8://鎶芥箍妯″紡
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airMode, AirCtrlParser.airModeDehum));
+                                                break;
                                         }
+                                    }
 
                                     break;
                                 case 2://閫氶鍣ㄦā寮忚繑鍥�
-                                    if (fanMode == 0 && thermostatMode == 0){
-                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich,AirCtrlParser.airOff)); //绌鸿皟鍏�
-                                    }else {
-                                        switch (fanMode){
+                                    if (fanMode == 0 && thermostatMode == 0) {
+                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich, AirCtrlParser.airOff)); //绌鸿皟鍏�
+                                    } else {
+                                        switch (fanMode) {
                                             case 1://浣庨
-                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed,AirCtrlParser.airSpeedLow));
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed, AirCtrlParser.airSpeedLow));
                                                 break;
                                             case 2://涓
-                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed,AirCtrlParser.airSpeedMid));
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed, AirCtrlParser.airSpeedMid));
                                                 break;
                                             case 3://楂橀
-                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed,AirCtrlParser.airSpeedHigh));
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed, AirCtrlParser.airSpeedHigh));
                                                 break;
                                             case 5://鑷姩
-                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed,AirCtrlParser.airSpeedAuto));
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSpeed, AirCtrlParser.airSpeedAuto));
                                                 break;
                                         }
                                     }
                                     break;
                                 case 3://璁剧疆娓╁害妯″紡杩斿洖
-                                    if (fanMode == 0 && thermostatMode == 0){
-                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich,AirCtrlParser.airOff)); //绌鸿皟鍏�
-                                    }else {
-                                        switch (thermostatMode){
+                                    if (fanMode == 0 && thermostatMode == 0) {
+                                        appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.airSwich, AirCtrlParser.airOff)); //绌鸿皟鍏�
+                                    } else {
+                                        switch (thermostatMode) {
                                             case 1://TODO 鑷姩妯″紡娓╁害杩斿洖闇�瑕佸崗璁笂鐨�
-                                                if (coolingSetpoint !=0 && heatingSetpoint ==0 ){
-                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.autoTem,coolingSetpoint));
-                                                }else {
-                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.autoTem,heatingSetpoint));
+                                                if (coolingSetpoint != 0 && heatingSetpoint == 0) {
+                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.autoTem, coolingSetpoint));
+                                                } else {
+                                                    appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.autoTem, heatingSetpoint));
                                                 }
                                                 break;
                                             case 3://鍒跺喎妯″紡
-                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.refTem,coolingSetpoint));
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.refTem, coolingSetpoint));
                                                 break;
                                             case 4://鍒剁儹妯″紡
-                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.heatTem,heatingSetpoint));
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.heatTem, heatingSetpoint));
                                                 break;
                                             case 8://鎶芥箍妯″紡
-                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.dehumTem,coolingSetpoint));
+                                                appliancesInfo.setArrCurState(AirCtrlParser.getAirPanelAddByte(AirCtrlParser.dehumTem, coolingSetpoint));
                                                 break;
                                         }
                                     }
                                     break;
                             }
-                            EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo,true));
+                            EventBus.getDefault().post(new DeviceStateEvent(appliancesInfo, true));
                             break;
                         case ZigbeeDeviceID.AirPanel:
                             //鏂伴璁惧鍥炶皟
                             statusReadBackBean = JsonUtil.parseJsonWithGson(event.getJson(), StatusReadBackBean.class);
                             FreshAirBackInfo freshAirBackInfo = new FreshAirBackInfo();
                             freshAirBackInfo.setAppliancesInfo(appliancesInfo);
-                            switch (statusReadBackBean.getValue()){
+                            switch (statusReadBackBean.getValue()) {
                                 case 0://椋庢墖鍏�
                                     freshAirBackInfo.setIsOn(0);
                                     freshAirBackInfo.setFreshAirSpeed(0);
@@ -909,12 +909,12 @@
                                 case 255:
                                     break;
                             }
-                            EventBus.getDefault().post(new FreshAirFeedBackEvent(freshAirBackInfo,true));
+                            EventBus.getDefault().post(new FreshAirFeedBackEvent(freshAirBackInfo, true));
                             break;
                         case ZigbeeDeviceID.SceneMark:
                             //鍦烘櫙鍥炶皟
-                            statusReadBackBean = JsonUtil.parseJsonWithGson(event.getJson(),StatusReadBackBean.class);
-                            if (statusReadBackBean.getValue() == 1){
+                            statusReadBackBean = JsonUtil.parseJsonWithGson(event.getJson(), StatusReadBackBean.class);
+                            if (statusReadBackBean.getValue() == 1) {
                                 LogicCtrlBackInfo logicCtrlBackInfo = new LogicCtrlBackInfo();
                                 logicCtrlBackInfo.setAppliancesInfo(appliancesInfo);
                                 EventBus.getDefault().post(new LogicFeedBackEvent(logicCtrlBackInfo, true));
@@ -923,7 +923,7 @@
                     }
                 }
             });
-        }else {
+        } else {
             if (appliancesInfo == null) {
                 return;
             }
@@ -1131,8 +1131,8 @@
                             && info.getChannelNum() == infos.get(j).getChannelNum()
                     ) {
                         //杩欓噷搴旇鏄淇鐨勶紝鏆傛椂鏈壘鍒般��
-                         //20190712瑙e喅寮哄埗杞崲int绫诲瀷闂��
-                        int  state = HDLUtlis.getIntegerByObject(infos.get(j).getCurStateObject());
+                        //20190712瑙e喅寮哄埗杞崲int绫诲瀷闂��
+                        int state = HDLUtlis.getIntegerByObject(infos.get(j).getCurStateObject());
                         switch (state) {
                             case -1:
                                 curState = 0;

--
Gitblit v1.8.0