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/HDLCommandText.java | 314 ++++++++++++++++++++++++++-------------------------
1 files changed, 159 insertions(+), 155 deletions(-)
diff --git a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java
index ab4e1fb..59422a0 100644
--- a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java
+++ b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommandText.java
@@ -1,6 +1,7 @@
package com.hdl.sdk.hdl_core.HDLDeviceManger.Core;
import android.util.Log;
+
import com.google.gson.Gson;
import com.hdl.sdk.hdl_core.Config.ZigbeeDeviceID;
import com.hdl.sdk.hdl_core.HDLDeviceManger.Bean.ZigbeeBean.CommonErrorBean;
@@ -39,7 +40,7 @@
private static boolean isFinished = false;//鏍囪鍥炶皟鍜屽満鏅澶囨暟鎹�
public static Timer timer = null;//璁剧疆璁惧鍜屽満鏅洖璋�
private static String ipAddr;//璁惧畾鎺у埗鏃剁殑ip鍦板潃
- private static boolean is1 = false,is2 = false;//鏍囪鑾峰彇鐨勬俯搴﹀拰椋庢墖寮哄害
+ private static boolean is1 = false, is2 = false;//鏍囪鑾峰彇鐨勬俯搴﹀拰椋庢墖寮哄害
private static int airTag = 0;//鏍囪浼犺繘鏉ユ帶鍒剁┖璋冪殑鏄粈涔堟柟寮忥紙寮�鍏炽�佹ā寮忋�侀閫熴�佽瀹氭俯搴︼級
private static int airMode = 1;//鏍囨敞鏇存敼娓╁害鏃讹紝鎺у埗鐨勬ā寮�
private static int scenesId = 0;//鍙戝満鏅椂浼犲叆锛屾柟渚挎敹鍦烘櫙
@@ -53,12 +54,12 @@
this.ipAddr = ipAddr;
}
- public static void initData(){
+ public static void initData() {
zigbeeDeviceListBeans = new ArrayList<>();//鎼滅储鎴栨帶鍒舵椂鍊欓渶鍒濆鍖�
}
- public interface DataCallBack{
- void onSuccess( List<ZigbeeDeviceListBean> zigbeeDeviceListBeans,ZigbeeSceneListBean zigbeeSceneListBeans);
+ public interface DataCallBack {
+ void onSuccess(List<ZigbeeDeviceListBean> zigbeeDeviceListBeans, ZigbeeSceneListBean zigbeeSceneListBeans);
}
//澶勭悊鎺ユ敹鐨勬暟鎹�
@@ -70,24 +71,24 @@
//鎵�鏈変俊鎭幏鍙栧畬澶勭悊
//閫夋嫨缃戝叧鐨勮瘽瑕佸湪鍒ゆ柇涓姞)
- if (topic.contains("Scene/GetInfo_Respon")){
+ if (topic.contains("Scene/GetInfo_Respon")) {
//澶勭悊鎼滅储鍒扮殑鍦烘櫙
handleSceneList(message);
}
- if (topic.contains("DeviceInfoRespon")){
+ if (topic.contains("DeviceInfoRespon")) {
//澶勭悊鑾峰彇鍒扮殑璁惧
handleDeviceList(message);
}
- if (topic.contains("Scene/Open_Respon")){
+ if (topic.contains("Scene/Open_Respon")) {
//杩斿洖鍦烘櫙琚墽琛�
reportSceneStatus(message);
return;
}
- if (topic.contains("DeviceInfoResponEnd")&&
- zigbeeDeviceListBeans.get(0).getData().getGwId().equals(gatewayId)){
+ if (topic.contains("DeviceInfoResponEnd") &&
+ zigbeeDeviceListBeans.get(0).getData().getGwId().equals(gatewayId)) {
Log.d("11113", "绋嬪簭鎺ュ彈瀹岃繘鏉ュ鐞�: ");
isFinished = true;
}
@@ -97,14 +98,14 @@
return;
}
- ZigbeeReportBean zigbeeReportBean =JsonUtil.parseJsonWithGson(message, ZigbeeReportBean.class);
+ ZigbeeReportBean zigbeeReportBean = JsonUtil.parseJsonWithGson(message, ZigbeeReportBean.class);
int cluterId = zigbeeReportBean.getData().getCluterID();
- if (!(cluterId == 6 || cluterId==8 || cluterId == 258 || cluterId == 513 || cluterId == 514)) {
+ if (!(cluterId == 6 || cluterId == 8 || cluterId == 258 || cluterId == 513 || cluterId == 514)) {
HDLLog.info("涓嶅鐞嗙殑cluterId:" + cluterId);
return;
}
int deviceID = zigbeeReportBean.getDevice_ID();
- switch (deviceID){
+ switch (deviceID) {
case ZigbeeDeviceID.OnOffOutput:
//鐏厜璁惧
StatusReadBackBean lightReadBackBean = new StatusReadBackBean();
@@ -121,28 +122,28 @@
}
break;
case ZigbeeDeviceID.WindowCoveringDevice:
- //绐楀笜璁惧
- StatusReadBackBean curtainReadBackBean = new StatusReadBackBean();
- for (ZigbeeReportBean.DataBean.AttriButeBean attriButeBean : zigbeeReportBean.getData()
- .getAttriBute()){
- if (attriButeBean.getAttriButeId() == 8){
- curtainReadBackBean.setValue(attriButeBean.getAttriButeData());
- }
- }
- String curtainReadBackJson = JsonUtil.toJson(curtainReadBackBean);
- if (stateListener != null) {
- StateEvent event = new StateEvent(curtainReadBackJson);
- stateListener.onData(event);
- }
+ //绐楀笜璁惧
+ StatusReadBackBean curtainReadBackBean = new StatusReadBackBean();
+ for (ZigbeeReportBean.DataBean.AttriButeBean attriButeBean : zigbeeReportBean.getData()
+ .getAttriBute()) {
+ if (attriButeBean.getAttriButeId() == 8) {
+ curtainReadBackBean.setValue(attriButeBean.getAttriButeData());
+ }
+ }
+ String curtainReadBackJson = JsonUtil.toJson(curtainReadBackBean);
+ if (stateListener != null) {
+ StateEvent event = new StateEvent(curtainReadBackJson);
+ stateListener.onData(event);
+ }
break;
case ZigbeeDeviceID.DimmableLight:
//璋冨厜鍣ㄨ澶�
StatusReadBackBean dimmableLightReadBackBean = new StatusReadBackBean();
for (ZigbeeReportBean.DataBean.AttriButeBean attriButeBean : zigbeeReportBean.getData()
.getAttriBute()) {
- if (attriButeBean.getAttriButeId() == 0 && cluterId==8 ) {
- Log.d("2222", "璋冨厜鍣ㄦ暟鎹�: "+attriButeBean.getAttriButeData());
- dimmableLightReadBackBean.setValue((int) (attriButeBean.getAttriButeData()/2.55));
+ if (attriButeBean.getAttriButeId() == 0 && cluterId == 8) {
+ Log.d("2222", "璋冨厜鍣ㄦ暟鎹�: " + attriButeBean.getAttriButeData());
+ dimmableLightReadBackBean.setValue((int) (attriButeBean.getAttriButeData() / 2.55));
}
}
String dimmableLightReadBackJson = JsonUtil.toJson(dimmableLightReadBackBean);
@@ -153,42 +154,43 @@
break;
case ZigbeeDeviceID.Thermostat:
//绌鸿皟璁惧
- for (ZigbeeReportBean.DataBean.AttriButeBean attriButeBean:zigbeeReportBean.getData().getAttriBute()){
+ for (ZigbeeReportBean.DataBean.AttriButeBean attriButeBean : zigbeeReportBean.getData().getAttriBute()) {
- if (attriButeBean.getAttriButeId() == 28 && attriButeBean.getAttriButeDataType() == 48){
+ if (attriButeBean.getAttriButeId() == 28 && attriButeBean.getAttriButeDataType() == 48) {
//褰撳墠鐨勭┖璋冩ā寮�
int thermostatmode = attriButeBean.getAttriButeData();
thermostatReadBackBean.setThermostatmode(thermostatmode);
is1 = true;
}
- if (attriButeBean.getAttriButeId() == 0 && attriButeBean.getAttriButeDataType() == 0x30){
+ if (attriButeBean.getAttriButeId() == 0 && attriButeBean.getAttriButeDataType() == 0x30) {
//褰撳墠鐨勬柊椋庢ā寮�
int fanmode = attriButeBean.getAttriButeData();
thermostatReadBackBean.setFanmode(fanmode);
is2 = true;
}
- if (attriButeBean.getAttriButeId() == 17 && attriButeBean.getAttriButeDataType() == 41){
+ if (attriButeBean.getAttriButeId() == 17 && attriButeBean.getAttriButeDataType() == 41) {
//鍒跺喎娓╁害
- int coolingSetpoint = attriButeBean.getAttriButeData()/100;
+ int coolingSetpoint = attriButeBean.getAttriButeData() / 100;
thermostatReadBackBean.setCoolingSetpoint(coolingSetpoint);
//Log.d("11113", "鍒跺喎娓╁害涓�: "+coolingSetpoint);
}
- if (attriButeBean.getAttriButeId() == 18 && attriButeBean.getAttriButeDataType() == 41){
+ if (attriButeBean.getAttriButeId() == 18 && attriButeBean.getAttriButeDataType() == 41) {
//鍒剁儹娓╁害
- int heatingSetpoint = attriButeBean.getAttriButeData()/100;
+ int heatingSetpoint = attriButeBean.getAttriButeData() / 100;
thermostatReadBackBean.setHeatingSetpoint(heatingSetpoint);
//Log.d("11113", "鍒剁儹娓╁害涓�: "+heatingSetpoint);
}
}
- if (is1 && is2 ){ //浠ｈ〃鑾峰彇鎭掓俯鍣ㄥ拰椋庢墖鐨勭姸鎬佸悗鐨勫洖璋�
- is1 = false;is2 = false;
+ if (is1 && is2) { //浠ｈ〃鑾峰彇鎭掓俯鍣ㄥ拰椋庢墖鐨勭姸鎬佸悗鐨勫洖璋�
+ is1 = false;
+ is2 = false;
thermostatReadBackBean.setTag(airTag);
String thermostatReadJson = JsonUtil.toJson(thermostatReadBackBean);
//Log.d("11113", "鏁版嵁鏁版嵁鏁版嵁"+thermostatReadJson);
- if (stateListener != null ){
+ if (stateListener != null) {
StateEvent event = new StateEvent(thermostatReadJson);
stateListener.onData(event);
}
@@ -197,8 +199,8 @@
case ZigbeeDeviceID.AirPanel:
//鏂伴璁惧
StatusReadBackBean airPanelReadBackBean = new StatusReadBackBean();
- for (ZigbeeReportBean.DataBean.AttriButeBean attriButeBean : zigbeeReportBean.getData().getAttriBute()){
- if (attriButeBean.getAttriButeId() == 0 && attriButeBean.getAttriButeDataType() == 0x30){
+ for (ZigbeeReportBean.DataBean.AttriButeBean attriButeBean : zigbeeReportBean.getData().getAttriBute()) {
+ if (attriButeBean.getAttriButeId() == 0 && attriButeBean.getAttriButeDataType() == 0x30) {
//褰撳墠鐨勬柊椋庢ā寮�
int fanmode = attriButeBean.getAttriButeData();
airPanelReadBackBean.setValue(fanmode);
@@ -213,10 +215,10 @@
}
}
- public static void sendThirdPartyJson(final ZigbeeDeviceSaveBean zigbeeJson, String statusJson, int type){
+ public static void sendThirdPartyJson(final ZigbeeDeviceSaveBean zigbeeJson, String statusJson, int type) {
HDLZigbeeMqtt.connect1(ipAddr);
// 鍒ゆ柇鏄痺rite 杩樻槸 read锛屾帶鍒舵椂鍒ゆ柇浼犻�掑弬鏁�
- switch (type){
+ switch (type) {
case ZigbeeDeviceID.OnOffOutput:
//缁х數鍣�
GatewayCommondBean gatewayCommondBean = JsonUtil.parseJsonWithGson(statusJson, GatewayCommondBean.class);
@@ -224,10 +226,10 @@
reportError("cmd parameter error, please check it out");
return;
}
- switch (gatewayCommondBean.getCmd()){
+ switch (gatewayCommondBean.getCmd()) {
case "write":
// 鐏厜鎺у埗锛�0鍏� 1寮�
- if (!(gatewayCommondBean.getValue()==1||gatewayCommondBean.getValue()==0)){
+ if (!(gatewayCommondBean.getValue() == 1 || gatewayCommondBean.getValue() == 0)) {
reportError("Wrong lighting control parameters");
return;
}
@@ -241,7 +243,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- HDLZigbeeMqtt.sendMqttData1( "DeviceControl", ctrlLightjson);
+ HDLZigbeeMqtt.sendMqttData1("DeviceControl", ctrlLightjson);
}
}).start();
break;
@@ -272,14 +274,14 @@
return;
}
//绐楀笜鎺у埗
- switch (gatewayCurtainBean.getCmd()){
+ switch (gatewayCurtainBean.getCmd()) {
case "write":
ZigbeeCtrlBean curtainCtrl = new ZigbeeCtrlBean();
curtainCtrl.setCluster_ID(258);
int curtainCmd;
- switch (gatewayCurtainBean.getTag()){
+ switch (gatewayCurtainBean.getTag()) {
case 0:
- switch (gatewayCurtainBean.getValue()){
+ switch (gatewayCurtainBean.getValue()) {
case 0:
curtainCmd = 0;
break;
@@ -328,53 +330,53 @@
curtainBean.setAttriBute(curtainAttriButeBeanList);
curtainReadBean.setData(curtainBean);
String curtainReadJson = JsonUtil.toJson(curtainReadBean);
- HDLZigbeeMqtt.sendMqttData1("GetDeviceStatus",curtainReadJson);
+ HDLZigbeeMqtt.sendMqttData1("GetDeviceStatus", curtainReadJson);
break;
}
break;
- case ZigbeeDeviceID.DimmableLight:
- //璋冨厜鐏�
- GatewayCommondBean dimmableLightBean = JsonUtil.parseJsonWithGson(statusJson, GatewayCommondBean.class);
- if (dimmableLightBean.getCmd() == null) {
- reportError("cmd parameter error, please check it out");
- return;
- }
- switch (dimmableLightBean.getCmd()){
- case "write":
- // 璋冨厜鎺у埗
- ZigbeeDimmableCtrlBean light = new ZigbeeDimmableCtrlBean();
- ZigbeeDimmableCtrlBean.Data data = new ZigbeeDimmableCtrlBean.Data();
- light.setCluster_ID(8);
- light.setSendMode(2);
- light.setCommand(4);
- light.setDeviceAddr(zigbeeJson.getDeviceAddr());
- light.setEpoint(zigbeeJson.getEpoint());
- data.setLevel(dimmableLightBean.getValue());
- data.setTransitionTime(2);
- light.setData(data);
- String ctrlLightjson = JsonUtil.toJson(light);
- HDLZigbeeMqtt.sendMqttData1( "DeviceControl", ctrlLightjson);
- break;
- case "read":
- ZigbeeReadBean lightReadBean = new ZigbeeReadBean();
- lightReadBean.setDeviceAddr(zigbeeJson.getDeviceAddr());
- lightReadBean.setEpoint(zigbeeJson.getEpoint());
- lightReadBean.setCluster_ID(8);
- lightReadBean.setCommand(108);
- lightReadBean.setSendMode(2);
+ case ZigbeeDeviceID.DimmableLight:
+ //璋冨厜鐏�
+ GatewayCommondBean dimmableLightBean = JsonUtil.parseJsonWithGson(statusJson, GatewayCommondBean.class);
+ if (dimmableLightBean.getCmd() == null) {
+ reportError("cmd parameter error, please check it out");
+ return;
+ }
+ switch (dimmableLightBean.getCmd()) {
+ case "write":
+ // 璋冨厜鎺у埗
+ ZigbeeDimmableCtrlBean light = new ZigbeeDimmableCtrlBean();
+ ZigbeeDimmableCtrlBean.Data data = new ZigbeeDimmableCtrlBean.Data();
+ light.setCluster_ID(8);
+ light.setSendMode(2);
+ light.setCommand(4);
+ light.setDeviceAddr(zigbeeJson.getDeviceAddr());
+ light.setEpoint(zigbeeJson.getEpoint());
+ data.setLevel(dimmableLightBean.getValue());
+ data.setTransitionTime(2);
+ light.setData(data);
+ String ctrlLightjson = JsonUtil.toJson(light);
+ HDLZigbeeMqtt.sendMqttData1("DeviceControl", ctrlLightjson);
+ break;
+ case "read":
+ ZigbeeReadBean lightReadBean = new ZigbeeReadBean();
+ lightReadBean.setDeviceAddr(zigbeeJson.getDeviceAddr());
+ lightReadBean.setEpoint(zigbeeJson.getEpoint());
+ lightReadBean.setCluster_ID(8);
+ lightReadBean.setCommand(108);
+ lightReadBean.setSendMode(2);
- ZigbeeReadBean.DataBean lightBean = new ZigbeeReadBean.DataBean();
- List<ZigbeeReadBean.DataBean.AttriButeBean> lightAttriButeBeanList = new ArrayList<>();
- ZigbeeReadBean.DataBean.AttriButeBean lightAttriButeBean = new ZigbeeReadBean.DataBean.AttriButeBean();
- lightAttriButeBean.setAttriButeId(0);
- lightAttriButeBeanList.add(lightAttriButeBean);
- lightBean.setAttriBute(lightAttriButeBeanList);
- lightReadBean.setData(lightBean);
- String lightReadJson = JsonUtil.toJson(lightReadBean);
- HDLZigbeeMqtt.sendMqttData1("GetDeviceStatus", lightReadJson);
- break;
- }
- break;
+ ZigbeeReadBean.DataBean lightBean = new ZigbeeReadBean.DataBean();
+ List<ZigbeeReadBean.DataBean.AttriButeBean> lightAttriButeBeanList = new ArrayList<>();
+ ZigbeeReadBean.DataBean.AttriButeBean lightAttriButeBean = new ZigbeeReadBean.DataBean.AttriButeBean();
+ lightAttriButeBean.setAttriButeId(0);
+ lightAttriButeBeanList.add(lightAttriButeBean);
+ lightBean.setAttriBute(lightAttriButeBeanList);
+ lightReadBean.setData(lightBean);
+ String lightReadJson = JsonUtil.toJson(lightReadBean);
+ HDLZigbeeMqtt.sendMqttData1("GetDeviceStatus", lightReadJson);
+ break;
+ }
+ break;
case ZigbeeDeviceID.Thermostat:
//绌鸿皟
final GatewayCommondBean thermostatBean = JsonUtil.parseJsonWithGson(statusJson, GatewayCommondBean.class);
@@ -382,17 +384,17 @@
reportError("cmd parameter error, please check it out");
return;
}
- switch (thermostatBean.getCmd()){
- case "write":
- switch (airTag){
+ switch (thermostatBean.getCmd()) {
+ case "write":
+ switch (airTag) {
case 0://寮�鍏�,寮�鍏充紶鍏ュ紑鍏�01
- switch (thermostatBean.getValue()){
+ switch (thermostatBean.getValue()) {
case 0://绌鸿皟鍏�
new Thread(new Runnable() {
@Override
public void run() {
- sendFan(zigbeeJson,0);//鍙戦�侀鎵囨帶鍒�
- sendThermostat(zigbeeJson,0);//鍙戦�佹亽娓╁櫒
+ sendFan(zigbeeJson, 0);//鍙戦�侀鎵囨帶鍒�
+ sendThermostat(zigbeeJson, 0);//鍙戦�佹亽娓╁櫒
}
}).start();
break;
@@ -400,8 +402,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- sendThermostat(zigbeeJson,1);
- sendFan(zigbeeJson,4);
+ sendThermostat(zigbeeJson, 1);
+ sendFan(zigbeeJson, 4);
}
}).start();
@@ -412,7 +414,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- sendThermostat(zigbeeJson,thermostatBean.getValue());
+ sendThermostat(zigbeeJson, thermostatBean.getValue());
}
}).start();
break;
@@ -420,17 +422,17 @@
new Thread(new Runnable() {
@Override
public void run() {
- sendFan(zigbeeJson,thermostatBean.getValue());
+ sendFan(zigbeeJson, thermostatBean.getValue());
}
}).start();
break;
case 3://鎺у埗娓╁害
- switch (airMode){
+ switch (airMode) {
case 0://鍒剁儹
new Thread(new Runnable() {
@Override
public void run() {
- contrlThermostat(zigbeeJson,thermostatBean.getValue(),0);
+ contrlThermostat(zigbeeJson, thermostatBean.getValue(), 0);
}
}).start();
break;
@@ -438,7 +440,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- contrlThermostat(zigbeeJson,thermostatBean.getValue(),1);
+ contrlThermostat(zigbeeJson, thermostatBean.getValue(), 1);
}
}).start();
break;
@@ -446,7 +448,7 @@
new Thread(new Runnable() {
@Override
public void run() {
- contrlThermostat(zigbeeJson,thermostatBean.getValue(),2);
+ contrlThermostat(zigbeeJson, thermostatBean.getValue(), 2);
}
}).start();
break;
@@ -493,9 +495,9 @@
reportError("cmd parameter error, please check it out");
return;
}
- switch (airpanelBean.getCmd()){
- case "write":
- sendNewFan(zigbeeJson,airpanelBean.getValue());
+ switch (airpanelBean.getCmd()) {
+ case "write":
+ sendNewFan(zigbeeJson, airpanelBean.getValue());
break;
case "read":
readFan(zigbeeJson);
@@ -507,49 +509,50 @@
}
//鍒濆鍖栫姸鎬佷俊鎭�
- public static void initStatus(final ZigbeeDeviceSaveBean zigbeeDevice, final int type){
+ public static void initStatus(final ZigbeeDeviceSaveBean zigbeeDevice, final int type) {
initData();
airTag = 0;
new Thread(new Runnable() {
@Override
public void run() {
- String sendStatus = HDLCommandText.setSendStatus("read",0);//璇讳笉闇�瑕佺煡閬撶姸鎬侊紝闅忎究濉竴涓�
- HDLCommandText.sendThirdPartyJson(zigbeeDevice,sendStatus, type);
+ String sendStatus = HDLCommandText.setSendStatus("read", 0);//璇讳笉闇�瑕佺煡閬撶姸鎬侊紝闅忎究濉竴涓�
+ HDLCommandText.sendThirdPartyJson(zigbeeDevice, sendStatus, type);
}
}).start();
}
//鏇存柊绌鸿皟鐘舵��
- public static void initAirStatus(final ZigbeeDeviceSaveBean zigbeeDevice,final int type ,int tag){
+ public static void initAirStatus(final ZigbeeDeviceSaveBean zigbeeDevice, final int type, int tag) {
airTag = tag;
- String sendStatus = HDLCommandText.setSendStatus("read",0);//璇讳笉闇�瑕佺煡閬撶姸鎬侊紝闅忎究濉竴涓�
- HDLCommandText.sendThirdPartyJson(zigbeeDevice,sendStatus, type);
+ String sendStatus = HDLCommandText.setSendStatus("read", 0);//璇讳笉闇�瑕佺煡閬撶姸鎬侊紝闅忎究濉竴涓�
+ HDLCommandText.sendThirdPartyJson(zigbeeDevice, sendStatus, type);
}
//鍙戦�佺┖璋冩帶鍒�
- public static void sendAirStatus(final ZigbeeDeviceSaveBean zigbeeDevice,final int type ,final int value,
- int tag,int mode){
- airTag = tag; airMode = mode;
- String sendStatus = HDLCommandText.setSendStatus("write",value);
- HDLCommandText.sendThirdPartyJson(zigbeeDevice,sendStatus,type);
+ public static void sendAirStatus(final ZigbeeDeviceSaveBean zigbeeDevice, final int type, final int value,
+ int tag, int mode) {
+ airTag = tag;
+ airMode = mode;
+ String sendStatus = HDLCommandText.setSendStatus("write", value);
+ HDLCommandText.sendThirdPartyJson(zigbeeDevice, sendStatus, type);
}
//鍙戦�佸紑鍏虫帶鍒舵帶鍒�
- public static void sendStatus(final ZigbeeDeviceSaveBean zigbeeDevice,final int type,final int value){
- String sendStatus = HDLCommandText.setSendStatus("write",value);
- HDLCommandText.sendThirdPartyJson(zigbeeDevice,sendStatus,type);
+ public static void sendStatus(final ZigbeeDeviceSaveBean zigbeeDevice, final int type, final int value) {
+ String sendStatus = HDLCommandText.setSendStatus("write", value);
+ HDLCommandText.sendThirdPartyJson(zigbeeDevice, sendStatus, type);
}
//鍒濆鍖栫獥甯樻帶鍒�
- public static void sendCurtainStatus(final ZigbeeDeviceSaveBean zigbeeDevice,final int type,
- final int value,final int tag){
- String sendStatus = HDLCommandText.setSendCurtainStatus("write",value,tag);
- HDLCommandText.sendThirdPartyJson(zigbeeDevice,sendStatus,type);
+ public static void sendCurtainStatus(final ZigbeeDeviceSaveBean zigbeeDevice, final int type,
+ final int value, final int tag) {
+ String sendStatus = HDLCommandText.setSendCurtainStatus("write", value, tag);
+ HDLCommandText.sendThirdPartyJson(zigbeeDevice, sendStatus, type);
}
//璁剧疆缁х數鍣ㄧ殑鐘舵��
- private static String setSendStatus(String status,int value){
+ private static String setSendStatus(String status, int value) {
GatewayCommondBean gatewayCommondBean = new GatewayCommondBean();
gatewayCommondBean.setCmd(status);
gatewayCommondBean.setValue(value);
@@ -558,7 +561,7 @@
}
//璁剧疆绐楀笜鐨勭姸鎬�
- private static String setSendCurtainStatus(String status,int value,int tag){
+ private static String setSendCurtainStatus(String status, int value, int tag) {
GatewayCurtainBean gatewayCurtainBean = new GatewayCurtainBean();
gatewayCurtainBean.setCmd(status);
gatewayCurtainBean.setValue(value);
@@ -568,7 +571,7 @@
}
//鍙戦�佹亽娓╁櫒妯″紡
- private static void sendThermostat(ZigbeeDeviceSaveBean zigbeeJson,int value){
+ private static void sendThermostat(ZigbeeDeviceSaveBean zigbeeJson, int value) {
ZigbeeWriteCtrlBean zigbeeOffBean = new ZigbeeWriteCtrlBean();
zigbeeOffBean.setDeviceAddr(zigbeeJson.getDeviceAddr());
zigbeeOffBean.setEpoint(zigbeeJson.getEpoint());
@@ -580,12 +583,12 @@
zigbeeOffDataBean.setAttributeData(value);
zigbeeOffBean.setData(zigbeeOffDataBean);
String zigbeeoffJson = JsonUtil.toJson(zigbeeOffBean);
- HDLZigbeeMqtt.sendMqttData1("SetWritableValue",zigbeeoffJson);
- initAirStatus(zigbeeJson,ZigbeeDeviceID.Thermostat,airTag);
+ HDLZigbeeMqtt.sendMqttData1("SetWritableValue", zigbeeoffJson);
+ initAirStatus(zigbeeJson, ZigbeeDeviceID.Thermostat, airTag);
}
//鍙戦�侀妯″紡
- private static void sendFan(final ZigbeeDeviceSaveBean zigbeeJson, int value){
+ private static void sendFan(final ZigbeeDeviceSaveBean zigbeeJson, int value) {
ZigbeeWriteCtrlBean zigbeeOffBean = new ZigbeeWriteCtrlBean();
zigbeeOffBean.setDeviceAddr(zigbeeJson.getDeviceAddr());
zigbeeOffBean.setEpoint(zigbeeJson.getEpoint());
@@ -597,12 +600,12 @@
zigbeeOffDataBean.setAttributeData(value);
zigbeeOffBean.setData(zigbeeOffDataBean);
String zigbeeoffJson = JsonUtil.toJson(zigbeeOffBean);
- HDLZigbeeMqtt.sendMqttData1("SetWritableValue",zigbeeoffJson);
- initAirStatus(zigbeeJson,ZigbeeDeviceID.Thermostat,airTag);
+ HDLZigbeeMqtt.sendMqttData1("SetWritableValue", zigbeeoffJson);
+ initAirStatus(zigbeeJson, ZigbeeDeviceID.Thermostat, airTag);
}
//鏂伴鐘舵�佷笅鍙戦�佹柊椋庢ā寮�
- private static void sendNewFan(final ZigbeeDeviceSaveBean zigbeeJson, int value){
+ private static void sendNewFan(final ZigbeeDeviceSaveBean zigbeeJson, int value) {
ZigbeeWriteCtrlBean zigbeeOffBean = new ZigbeeWriteCtrlBean();
zigbeeOffBean.setDeviceAddr(zigbeeJson.getDeviceAddr());
zigbeeOffBean.setEpoint(zigbeeJson.getEpoint());
@@ -614,12 +617,12 @@
zigbeeOffDataBean.setAttributeData(value);
zigbeeOffBean.setData(zigbeeOffDataBean);
String zigbeeoffJson = JsonUtil.toJson(zigbeeOffBean);
- HDLZigbeeMqtt.sendMqttData1("SetWritableValue",zigbeeoffJson);
- initStatus(zigbeeJson,ZigbeeDeviceID.AirPanel);
+ HDLZigbeeMqtt.sendMqttData1("SetWritableValue", zigbeeoffJson);
+ initStatus(zigbeeJson, ZigbeeDeviceID.AirPanel);
}
//娓╁害鎺у埗
- private static void contrlThermostat(ZigbeeDeviceSaveBean zigbeeJson,int value, int mode){
+ private static void contrlThermostat(ZigbeeDeviceSaveBean zigbeeJson, int value, int mode) {
ZigbeeThermostatCtrlBean zigbeeThermostatCtrlBean = new ZigbeeThermostatCtrlBean();
zigbeeThermostatCtrlBean.setDeviceAddr(zigbeeJson.getDeviceAddr());
zigbeeThermostatCtrlBean.setEpoint(zigbeeJson.getEpoint());
@@ -631,12 +634,12 @@
zigbeeData.setAmount(value);
zigbeeThermostatCtrlBean.setData(zigbeeData);
String zigbeeCtrlJson = JsonUtil.toJson(zigbeeThermostatCtrlBean);
- HDLZigbeeMqtt.sendMqttData1("DeviceControl",zigbeeCtrlJson);
- initAirStatus(zigbeeJson,ZigbeeDeviceID.Thermostat,airTag);
+ HDLZigbeeMqtt.sendMqttData1("DeviceControl", zigbeeCtrlJson);
+ initAirStatus(zigbeeJson, ZigbeeDeviceID.Thermostat, airTag);
}
//鏌ョ湅椋庨��
- private static void readFan(ZigbeeDeviceSaveBean zigbeeJson){
+ private static void readFan(ZigbeeDeviceSaveBean zigbeeJson) {
//鑾峰彇褰撳墠閫氶淇℃伅
ZigbeeReadBean fanBean = new ZigbeeReadBean();
@@ -657,7 +660,7 @@
}
//鍙戦�佸満鏅暟鎹�
- public static void sendSceneStatus(int ScenesId,int DelayTime){
+ public static void sendSceneStatus(int ScenesId, int DelayTime) {
scenesId = ScenesId;
ZigbeeSceneCtrlBean zigbeeSceneCtrlBean = new ZigbeeSceneCtrlBean();
zigbeeSceneCtrlBean.setCluster_ID(0);
@@ -667,19 +670,19 @@
dataBean.setDelayTime(DelayTime);
zigbeeSceneCtrlBean.setData(dataBean);
String json = JsonUtil.toJson(zigbeeSceneCtrlBean);
- HDLZigbeeMqtt.sendMqttData1("Scene/Open",json);
+ HDLZigbeeMqtt.sendMqttData1("Scene/Open", json);
}
//澶勭悊璁惧淇℃伅
private static void handleDeviceList(String message) {
- ZigbeeDeviceListBean zigbeeDeviceListBean = JsonUtil.parseJsonWithGson(message,ZigbeeDeviceListBean.class);
+ ZigbeeDeviceListBean zigbeeDeviceListBean = JsonUtil.parseJsonWithGson(message, ZigbeeDeviceListBean.class);
zigbeeDeviceListBeans.add(zigbeeDeviceListBean);
}
//澶勭悊鍦烘櫙淇℃伅
private static void handleSceneList(String message) {
Gson gson = new Gson();
- zigbeeSceneListBean = gson.fromJson(message,ZigbeeSceneListBean.class);
+ zigbeeSceneListBean = gson.fromJson(message, ZigbeeSceneListBean.class);
}
//澶勭悊鍦烘櫙鐨勬暟鎹�
@@ -690,11 +693,11 @@
return;
}
StatusReadBackBean statusReadBackBean = new StatusReadBackBean();
- if (sceneCtrlBackBean.getData().getScenesId() == scenesId){
+ if (sceneCtrlBackBean.getData().getScenesId() == scenesId) {
statusReadBackBean.setValue(sceneCtrlBackBean.getData().getResult());
}
String Json = JsonUtil.toJson(statusReadBackBean);
- Log.d("11114", "澶勭悊鏁版嵁鍥炶皟: "+Json);
+ Log.d("11114", "澶勭悊鏁版嵁鍥炶皟: " + Json);
if (stateListener != null) {
StateEvent event = new StateEvent(Json);
stateListener.onData(event);
@@ -702,25 +705,26 @@
}
//鍥炶皟鑾峰彇鍒扮殑璁惧淇℃伅
- public static void handleDeviceData(final DataCallBack dataCallBack){
+ public static void handleDeviceData(final DataCallBack dataCallBack) {
timer = new Timer();
timer.schedule(new TimerTask() {
@Override
public void run() {
- if (!isFinished){
+ if (!isFinished) {
Log.d("11112", "run: 绋嬪簭鎵ц涓�");
- }else {
+ } else {
timer.cancel();
timer.purge();
timer = null;
isFinished = false;
- dataCallBack.onSuccess(zigbeeDeviceListBeans,zigbeeSceneListBean);
+ dataCallBack.onSuccess(zigbeeDeviceListBeans, zigbeeSceneListBean);
}
}
- },1,500);
+ }, 1, 500);
}
- public static void reSearch(){
- if (timer != null){
+
+ public static void reSearch() {
+ if (timer != null) {
timer.cancel();
timer.purge();
timer = null;
@@ -734,7 +738,7 @@
CommonErrorBean errorBean = new CommonErrorBean();
errorBean.setCmd("error");
errorBean.setReason(reason);
- String errorJson =JsonUtil.toJson(errorBean);
+ String errorJson = JsonUtil.toJson(errorBean);
StateEvent event = new StateEvent(errorJson);
stateListener.onData(event);
}
--
Gitblit v1.8.0