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/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java | 75 ++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 39 deletions(-)
diff --git a/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java b/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
index c20bfca..6d4d53c 100644
--- a/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
+++ b/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
@@ -60,7 +60,6 @@
private boolean isZigbee = false;
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -71,13 +70,12 @@
// 姝ゆ柟娉曚负涓诲姩鑾峰彇鍗曚竴璁惧鐘舵�侊紝閫昏緫妯″潡銆佽儗鏅煶涔愭ā鍧楁病鏈夎繖涓猘pi锛屼粎鏀寔鐏厜锛岀獥甯橈紝绌鸿皟銆備竴鑸笉闇�瑕佺敤鍒般��
- // HDLCommand.getDeviceState(appliancesInfo);
+ // HDLCommand.getDeviceState(appliancesInfo);
initcurState();
initView();
initClickOnEvent();
-
}
@@ -433,9 +431,9 @@
private void initcurState() {
appliancesInfo = (AppliancesInfo) getIntent().getSerializableExtra("hdl");
isZigbee = getIntent().getExtras().getBoolean("isZigbee2Item");
- if (isZigbee){
- HDLCommand.getDeviceState(CtrlActivity.this,appliancesInfo,isZigbee);//濡傛灉鏄痾igbee鐨勯渶瑕佽皟鐢ㄥ崟涓�鐘舵�佸洖澶�
- }else {
+ if (isZigbee) {
+ HDLCommand.getDeviceState(CtrlActivity.this, appliancesInfo, isZigbee);//濡傛灉鏄痾igbee鐨勯渶瑕佽皟鐢ㄥ崟涓�鐘舵�佸洖澶�
+ } else {
// lightState = 100;//鍒濆鍖栫伅鍏変寒搴�100
curtainState = CurtainCtrlParser.curtainOff;
// 鑾峰彇鎵�鏈夎澶囩殑鐘舵�併�俤eviceStateBeanList涓烘墍鏈夎澶囩殑鐘舵�佸垪琛�
@@ -516,7 +514,7 @@
lightBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- HDLCommand.lightCtrl(appliancesInfo, 50,isZigbee);//state鍊间唬琛ㄨ皟鍏夊ぇ灏�0-100
+ HDLCommand.lightCtrl(appliancesInfo, 50, isZigbee);//state鍊间唬琛ㄨ皟鍏夊ぇ灏�0-100
// HDLCommand.lightCtrl(appliancesInfo,50,isZigbee);
}
});
@@ -525,7 +523,7 @@
@Override
public void onClick(View view) {
//绐楀笜妯″潡绗簩涓弬鏁� 涓篊urtainCtrlParser.curtainOn锛孋urtainCtrlParser.curtainOff锛孋urtainCtrlParser.curtainPause鍏朵腑涓�涓�
- HDLCommand.curtainCtrl(appliancesInfo, curtainState,isZigbee);
+ HDLCommand.curtainCtrl(appliancesInfo, curtainState, isZigbee);
if (curtainState == CurtainCtrlParser.curtainOn) {
curtainState = CurtainCtrlParser.curtainOff;
} else {
@@ -538,14 +536,14 @@
curtainBtn2.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOn,isZigbee);
+ HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOn, isZigbee);
}
});
curtainBtn3.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOff,isZigbee);
+ HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainOff, isZigbee);
}
});
@@ -553,14 +551,14 @@
curtainBtn4.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainPause,isZigbee);
+ HDLCommand.curtainCtrl(appliancesInfo, CurtainCtrlParser.curtainPause, isZigbee);
}
});
curtainBtn5.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.curtainCtrl(appliancesInfo, 20,isZigbee);
+ HDLCommand.curtainCtrl(appliancesInfo, 20, isZigbee);
}
});
@@ -568,11 +566,11 @@
@Override
public void onClick(View view) {
//婕旂ず褰撳墠鐘舵�佷负鍏筹紝璁剧疆涓哄紑銆傚紑锛岃缃负鍏炽��
- if (airSwitchState == 0) {
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSwich, AirCtrlParser.airOn,isZigbee);//绌鸿皟寮�
- } else {
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSwich, AirCtrlParser.airOff,isZigbee);//绌鸿皟鍏�
- }
+ if (airSwitchState == 0) {
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSwich, AirCtrlParser.airOn, isZigbee);//绌鸿皟寮�
+ } else {
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSwich, AirCtrlParser.airOff, isZigbee);//绌鸿皟鍏�
+ }
}
});
@@ -583,26 +581,26 @@
switch (airModeState) {
case 0:
//鑻ュ綋鍓嶇┖璋冩ā寮忎负鍒跺喎锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓哄埗鐑�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeHeatTem,isZigbee);//绌鸿皟妯″紡鍒剁儹
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeHeatTem, isZigbee);//绌鸿皟妯″紡鍒剁儹
break;
case 1:
//鑻ュ綋鍓嶇┖璋冩ā寮忎负鍒剁儹锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓洪�氶
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeVen,isZigbee);//绌鸿皟妯″紡閫氶
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeVen, isZigbee);//绌鸿皟妯″紡閫氶
break;
case 2:
//鑻ュ綋鍓嶇┖璋冩ā寮忎负閫氶锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓鸿嚜鍔�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeAuto,isZigbee);//绌鸿皟妯″紡鑷姩
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeAuto, isZigbee);//绌鸿皟妯″紡鑷姩
break;
case 3:
//鑻ュ綋鍓嶇┖璋冩ā寮忎负鑷姩锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓烘娊婀�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeDehum,isZigbee);//绌鸿皟妯″紡鎶芥箍
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeDehum, isZigbee);//绌鸿皟妯″紡鎶芥箍
break;
case 4:
//鑻ュ綋鍓嶇┖璋冩ā寮忎负鎶芥箍锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓哄埗鍐�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeRefTem,isZigbee);//绌鸿皟妯″紡鍒跺喎
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeRefTem, isZigbee);//绌鸿皟妯″紡鍒跺喎
break;
default:
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeRefTem,isZigbee);//绌鸿皟妯″紡鍒跺喎
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airMode, AirCtrlParser.airModeRefTem, isZigbee);//绌鸿皟妯″紡鍒跺喎
break;
}
@@ -617,19 +615,19 @@
switch (airSpeedState) {
case 0:
//鑻ュ綋鍓嶇┖璋冮閫熶负鑷姩锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓洪珮椋�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedHigh,isZigbee);//椋庨�熼珮椋�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedHigh, isZigbee);//椋庨�熼珮椋�
break;
case 1:
//鑻ュ綋鍓嶇┖璋冮閫熶负楂橀锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓轰腑椋�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedMid,isZigbee);//椋庨�熶腑椋�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedMid, isZigbee);//椋庨�熶腑椋�
break;
case 2:
//鑻ュ綋鍓嶇┖璋冮閫熶负涓锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓轰綆椋�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedLow,isZigbee);//椋庨�熶綆椋�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedLow, isZigbee);//椋庨�熶綆椋�
break;
case 3:
//鑻ュ綋鍓嶇┖璋冮閫熶负浣庨锛屽垯鐐瑰嚮鎸夐挳璁剧疆涓鸿嚜鍔�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedAuto,isZigbee);//椋庨�熻嚜鍔�
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.airSpeed, AirCtrlParser.airSpeedAuto, isZigbee);//椋庨�熻嚜鍔�
break;
}
}
@@ -653,11 +651,11 @@
switch (airModeState) {
case 0:
//褰撳墠绌鸿皟妯″紡涓哄埗鍐�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.refTem, tempInt,isZigbee);//鍒跺喎娓╁害
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.refTem, tempInt, isZigbee);//鍒跺喎娓╁害
break;
case 1:
//褰撳墠绌鸿皟妯″紡涓哄埗鐑�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.heatTem, tempInt,isZigbee);//鍒剁儹娓╁害
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.heatTem, tempInt, isZigbee);//鍒剁儹娓╁害
break;
case 2:
//褰撳墠绌鸿皟妯″紡涓洪�氶
@@ -665,11 +663,11 @@
break;
case 3:
//褰撳墠绌鸿皟妯″紡涓鸿嚜鍔�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.autoTem, tempInt,isZigbee);//鑷姩娓╁害
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.autoTem, tempInt, isZigbee);//鑷姩娓╁害
break;
case 4:
//褰撳墠绌鸿皟妯″紡涓烘娊婀�
- HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.dehumTem, tempInt,isZigbee);//鎶芥箍娓╁害
+ HDLCommand.airCtrl(appliancesInfo, AirCtrlParser.dehumTem, tempInt, isZigbee);//鎶芥箍娓╁害
break;
default:
break;
@@ -685,14 +683,14 @@
logicBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.logicCtrl(appliancesInfo,isZigbee);
+ HDLCommand.logicCtrl(appliancesInfo, isZigbee);
}
});
sensorBtn.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
- HDLCommand.getDeviceState(CtrlActivity.this,appliancesInfo,isZigbee);
+ HDLCommand.getDeviceState(CtrlActivity.this, appliancesInfo, isZigbee);
}
});
}
@@ -712,7 +710,7 @@
&& event.getLightCtrlBackInfo().getChannelNum() == appliancesInfo.getChannelNum()
&& event.getLightCtrlBackInfo().getPhysicsChannelNum() == appliancesInfo.getPhysicsChannelNum()
&& event.getLightCtrlBackInfo().getAppliancesInfo().getDeviceType() == appliancesInfo.getDeviceType()
- ) {
+ ) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
showToast("鐏厜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
@@ -739,7 +737,7 @@
if (event.getCurtainCtrlBackInfo().getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
&& event.getCurtainCtrlBackInfo().getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
&& event.getCurtainCtrlBackInfo().getNum() == appliancesInfo.getChannelNum()
- ) {
+ ) {
if (!event.isSuccess()) {
showToast("绐楀笜鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
@@ -790,7 +788,7 @@
if (event.getAirCtrlBackInfo().getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
&& event.getAirCtrlBackInfo().getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
&& event.getAirCtrlBackInfo().getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum()
- ) {
+ ) {
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (!event.isSuccess()) {
showToast("绌鸿皟鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
@@ -932,7 +930,7 @@
// 鍏堝垽鏂槸鍚﹁秴鏃�
if (event.getLogicCtrlBackInfo().getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
&& event.getLogicCtrlBackInfo().getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
- ) {
+ ) {
if (!event.isSuccess()) {
showToast("鍦烘櫙鎺у埗瓒呮椂锛岃閲嶆柊鍐嶈瘯");
return;
@@ -946,7 +944,7 @@
public void onDeviceStateEventMain(DeviceStateEvent event) {
if (event.getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
&& event.getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
- ) {
+ ) {
//杩欎釜杩斿洖鐨勪俊鎭槸褰撳墠鐘舵�佺殑
switch (event.getAppliancesInfo().getDeviceType()) {
case HDLApConfig.TYPE_LIGHT_DIMMER:
@@ -1409,7 +1407,6 @@
}
}
}
-
public void showToast(String text) {
--
Gitblit v1.8.0