From d6d95564b016c281bfa2e8c2454db8d71083e858 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 26 十一月 2019 17:48:09 +0800
Subject: [PATCH] 2019-11-26 1.控制命令改为广播模式。
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java | 82 +++++++++++++++++++++--------------------
1 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
index 4a09520..543a8af 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/CtrlActivity.java
@@ -23,6 +23,7 @@
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.DeviceStateEvent;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.LightFeedBackEvent;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.LogicFeedBackEvent;
+import com.hdl.sdk.hdl_core.Util.TransformUtil.HDLUtlis;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -126,8 +127,9 @@
sensorText.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
- int curLightState = (int) appliancesInfo.getCurState();
+ if (appliancesInfo.getCurStateObject() != null) {
+
+ int curLightState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurStateObject());
lightText.setText("褰撳墠鐏厜浜害锛�" + curLightState);
lightBtn.setText("褰撳墠鐏厜浜害锛�" + curLightState);
@@ -163,9 +165,9 @@
curtainBtn4.setVisibility(View.GONE);
curtainBtn5.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
+ if (appliancesInfo.getCurStateObject() != null) {
String stringCurtainState = "";
- int curCurtainState = (int) appliancesInfo.getCurState();
+ int curCurtainState = HDLUtlis.getIntegerByObject(appliancesInfo.getCurStateObject());
Log.i("djl", "curCurtainState = " + curCurtainState);
switch (curCurtainState) {
case CurtainCtrlParser.TYPE_STATE_PAUSE:
@@ -197,8 +199,8 @@
curText1.setVisibility(View.GONE);
curtainBtn.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
- curText2.setText("褰撳墠绐楀笜鐘舵�侊細" + appliancesInfo.getCurState());
+ if (appliancesInfo.getCurStateObject() != null) {
+ curText2.setText("褰撳墠绐楀笜鐘舵�侊細" + HDLUtlis.getIntegerByObject(appliancesInfo.getCurStateObject()));
} else {
curText2.setText("鏈幏鍙栧埌绐楀笜妯″潡鐘舵��");
}
@@ -410,8 +412,8 @@
lightText.setVisibility(View.GONE);
logicBtn.setVisibility(View.GONE);
logicText.setVisibility(View.GONE);
- if (appliancesInfo.getCurState() != null) {
- float value = (float) appliancesInfo.getCurState();
+ if (appliancesInfo.getCurStateObject() != null) {
+ float value = (float) appliancesInfo.getCurStateObject();
sensorBtn.setText("浼犳劅鍣ㄦ暟鍊硷細" + value);
}
break;
@@ -630,16 +632,16 @@
@Override
public void onClick(View view) {
String tempStr = airTempEd.getText().toString();
- if (TextUtils.isEmpty(tempStr) || TextUtils.isEmpty(tempStr)) {
+ if (TextUtils.isEmpty(tempStr)) {
showToast("璁剧疆鐨勬俯搴︿笉鑳戒负绌�");
return;
}
int tempInt = Integer.parseInt(tempStr);
- if (tempInt < 16 || tempInt > 30) {
- showToast("娓╁害璁剧疆鑼冨洿涓猴細16~30鎽勬皬搴�(鈩�)");
- return;
- }
+// if (tempInt < 16 || tempInt > 30) {
+// showToast("娓╁害璁剧疆鑼冨洿涓猴細16~30鎽勬皬搴�(鈩�)");
+// return;
+// }
switch (airModeState) {
case 0:
@@ -948,7 +950,7 @@
showToast("鑾峰彇鐏厜鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- lightBtn.setText("浜害 = " + event.getAppliancesInfo().getCurState());
+ lightBtn.setText("浜害 = " + HDLUtlis.getIntegerByObject(event.getAppliancesInfo().getCurStateObject()));
}
break;
case HDLApConfig.TYPE_CURTAIN_GLYSTRO:
@@ -961,7 +963,7 @@
}
//绐楀笜妯″潡锛歝urState:0=鍋滄,1=鎵撳紑,2=鍏抽棴銆�
//寮�鍚堝笜鐢垫満锛屽嵎甯樼數鏈猴細curState:1-100寮�鍚堝害銆�
- int curState = (int) event.getAppliancesInfo().getCurState();
+ int curState = HDLUtlis.getIntegerByObject(event.getAppliancesInfo().getCurStateObject());
if (event.getAppliancesInfo().getDeviceType() == HDLApConfig.TYPE_CURTAIN_MODULE) {//鍒ゆ柇鏄惁涓虹獥甯樻ā鍧�,鍚﹀垯涓哄紑鍚堝笜鎴栧嵎甯樼數鏈�
switch (curState) {
case CurtainCtrlParser.curtainOff:
@@ -1123,7 +1125,7 @@
showToast("鑾峰彇浼犳劅鍣�---骞叉帴鐐圭姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float dryContactValue = (float) event.getAppliancesInfo().getCurState();
+ float dryContactValue = (float) event.getAppliancesInfo().getCurStateObject();
String dryContactUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
Log.i("djl", "浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
@@ -1134,7 +1136,7 @@
showToast("鑾峰彇浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︾姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float mdValue = (float) event.getAppliancesInfo().getCurState();
+ float mdValue = (float) event.getAppliancesInfo().getCurStateObject();
String mdValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
Log.i("djl", "浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
@@ -1145,7 +1147,7 @@
showToast("鑾峰彇浼犳劅鍣�---娓╁害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float tempValue = (float) event.getAppliancesInfo().getCurState();
+ float tempValue = (float) event.getAppliancesInfo().getCurStateObject();
String tempValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
Log.i("djl", "浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
@@ -1156,7 +1158,7 @@
showToast("鑾峰彇浼犳劅鍣�---婀垮害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float humidityValue = (float) event.getAppliancesInfo().getCurState();
+ float humidityValue = (float) event.getAppliancesInfo().getCurStateObject();
String humidityValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
Log.i("djl", "浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
@@ -1167,7 +1169,7 @@
showToast("鑾峰彇浼犳劅鍣�---鐓у害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float illuminaceValue = (float) event.getAppliancesInfo().getCurState();
+ float illuminaceValue = (float) event.getAppliancesInfo().getCurStateObject();
String illuminaceValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
Log.i("djl", "浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
@@ -1178,7 +1180,7 @@
showToast("鑾峰彇浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float vocValue = (float) event.getAppliancesInfo().getCurState();
+ float vocValue = (float) event.getAppliancesInfo().getCurStateObject();
String vocValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
Log.i("djl", "浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
@@ -1189,7 +1191,7 @@
showToast("鑾峰彇浼犳劅鍣�---pm2.5鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float pm2_5Value = (float) event.getAppliancesInfo().getCurState();
+ float pm2_5Value = (float) event.getAppliancesInfo().getCurStateObject();
String pm2_5ValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
Log.i("djl", "浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
@@ -1200,7 +1202,7 @@
showToast("鑾峰彇浼犳劅鍣�---浜屾哀鍖栫⒊鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float co2Value = (float) event.getAppliancesInfo().getCurState();
+ float co2Value = (float) event.getAppliancesInfo().getCurStateObject();
String co2ValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
Log.i("djl", "浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
@@ -1211,7 +1213,7 @@
showToast("鑾峰彇浼犳劅鍣�---娑插寲鐭虫补姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float lpgValue = (float) event.getAppliancesInfo().getCurState();
+ float lpgValue = (float) event.getAppliancesInfo().getCurStateObject();
String lpgValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
Log.i("djl", "浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
@@ -1222,7 +1224,7 @@
showToast("鑾峰彇浼犳劅鍣�---浜哄伐鐓ゆ皵鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float coh2Value = (float) event.getAppliancesInfo().getCurState();
+ float coh2Value = (float) event.getAppliancesInfo().getCurStateObject();
String coh2ValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
Log.i("djl", "浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
@@ -1233,7 +1235,7 @@
showToast("鑾峰彇浼犳劅鍣�---澶╃劧姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float ch4Value = (float) event.getAppliancesInfo().getCurState();
+ float ch4Value = (float) event.getAppliancesInfo().getCurStateObject();
String ch4ValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
Log.i("djl", "浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
@@ -1244,7 +1246,7 @@
showToast("鑾峰彇浼犳劅鍣�---鐑熼浘鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float smogValue = (float) event.getAppliancesInfo().getCurState();
+ float smogValue = (float) event.getAppliancesInfo().getCurStateObject();
String smogValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
Log.i("djl", "浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
@@ -1255,7 +1257,7 @@
showToast("鑾峰彇浼犳劅鍣�---椋庨�熺姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float windSpeedValue = (float) event.getAppliancesInfo().getCurState();
+ float windSpeedValue = (float) event.getAppliancesInfo().getCurStateObject();
String windSpeedValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
Log.i("djl", "浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
@@ -1266,7 +1268,7 @@
showToast("鑾峰彇浼犳劅鍣�---椋庡帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float windPressureValue = (float) event.getAppliancesInfo().getCurState();
+ float windPressureValue = (float) event.getAppliancesInfo().getCurStateObject();
String windPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
Log.i("djl", "浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
@@ -1277,7 +1279,7 @@
showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娴侀噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float liquidFlowValue = (float) event.getAppliancesInfo().getCurState();
+ float liquidFlowValue = (float) event.getAppliancesInfo().getCurStateObject();
String liquidFlowValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
Log.i("djl", "浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
@@ -1288,7 +1290,7 @@
showToast("鑾峰彇浼犳劅鍣�---娑蹭綋鍘嬪姏鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float liquidPressureValue = (float) event.getAppliancesInfo().getCurState();
+ float liquidPressureValue = (float) event.getAppliancesInfo().getCurStateObject();
String liquidPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
Log.i("djl", "浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
@@ -1299,7 +1301,7 @@
showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娣卞害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float liquidDepthValue = (float) event.getAppliancesInfo().getCurState();
+ float liquidDepthValue = (float) event.getAppliancesInfo().getCurStateObject();
String liquidDepthValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
Log.i("djl", "浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
@@ -1310,7 +1312,7 @@
showToast("鑾峰彇浼犳劅鍣�---闆ㄩ噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float rainFallValue = (float) event.getAppliancesInfo().getCurState();
+ float rainFallValue = (float) event.getAppliancesInfo().getCurStateObject();
String rainFallValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
Log.i("djl", "浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
@@ -1321,7 +1323,7 @@
showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float weightValue = (float) event.getAppliancesInfo().getCurState();
+ float weightValue = (float) event.getAppliancesInfo().getCurStateObject();
String weightValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
Log.i("djl", "浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
@@ -1332,7 +1334,7 @@
showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float height_lengthValue = (float) event.getAppliancesInfo().getCurState();
+ float height_lengthValue = (float) event.getAppliancesInfo().getCurStateObject();
String height_lengthValueUnit = ((SensorStateBackInfo) event).getUnite();
showToast("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
Log.i("djl", "浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
@@ -1343,7 +1345,7 @@
showToast("鑾峰彇浼犳劅鍣�---鐗╀綋閫熷害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float objectSpeedValue = (float) event.getAppliancesInfo().getCurState();
+ float objectSpeedValue = (float) event.getAppliancesInfo().getCurStateObject();
String objectSpeedUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
showToast("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
Log.i("djl", "浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
@@ -1354,7 +1356,7 @@
showToast("鑾峰彇浼犳劅鍣�---闇囧姩鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float shakeValue = (float) event.getAppliancesInfo().getCurState();
+ float shakeValue = (float) event.getAppliancesInfo().getCurStateObject();
String shakeValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
showToast("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
Log.i("djl", "浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
@@ -1365,7 +1367,7 @@
showToast("鑾峰彇浼犳劅鍣�---鐢靛帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float voltageValue = (float) event.getAppliancesInfo().getCurState();
+ float voltageValue = (float) event.getAppliancesInfo().getCurStateObject();
String voltageValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
showToast("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
Log.i("djl", "浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
@@ -1376,7 +1378,7 @@
showToast("鑾峰彇浼犳劅鍣�---鐢垫祦鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float electricityValue = (float) event.getAppliancesInfo().getCurState();
+ float electricityValue = (float) event.getAppliancesInfo().getCurStateObject();
String electricityValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
showToast("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
Log.i("djl", "浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
@@ -1387,7 +1389,7 @@
showToast("鑾峰彇浼犳劅鍣�---鍔熺巼鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
return;
}
- float powerValue = (float) event.getAppliancesInfo().getCurState();
+ float powerValue = (float) event.getAppliancesInfo().getCurStateObject();
String powerValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
showToast("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
Log.i("djl", "浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
--
Gitblit v1.8.0