From 47675876dbc24ea2fa54a1f4090f1a998ed2e5cf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 06 八月 2021 16:18:11 +0800
Subject: [PATCH] 2021-08-06 1.配合海克传感器，调整处理模拟量传感器状态
---
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLSensor/SensorStateBackInfo.java | 1
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java | 19 +
hdl_core/src/main/java/com/hdl/sdk/hdl_core/Config/Configuration.java | 9
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java | 70 ++++
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/SensorActivity.java | 579 +++++++++++++++++++-------------------
README的副本.md | 74 ++++
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java | 3
README.md | 2
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java | 115 ++++++-
9 files changed, 558 insertions(+), 314 deletions(-)
diff --git a/README.md b/README.md
index ee8bc73..975666a 100644
--- a/README.md
+++ b/README.md
@@ -66,8 +66,6 @@
HDLDeviceManager.saveDevicesDataList();
-鎻愪緵澹板繀鍙疭DK椤圭洰
-
##Version 1.0.2
1.鏂板鍦扮儹妯″潡鍜屾柊椋庣郴缁熸帶鍒跺拰璇诲彇鐘舵�佹帴鍙ｏ紱
2.鏂板鍦扮儹妯″潡鍜屾柊椋庣郴缁熸帶鍒舵紨绀洪〉闈紱
diff --git "a/README\347\232\204\345\211\257\346\234\254.md" "b/README\347\232\204\345\211\257\346\234\254.md"
new file mode 100644
index 0000000..ee8bc73
--- /dev/null
+++ "b/README\347\232\204\345\211\257\346\234\254.md"
@@ -0,0 +1,74 @@
+## Android_HDL_SDK_XW
+
+HDL XW Android SDK Copyright (c) 2019 HDL Inc.
+
+SDK 鐗堟湰锛歨dl_lib_v1.7.2.20201020_beta
+1.澧炲姞RGB鍜孋CT鐏澶囨敮鎸�
+
+
+SDK 鐗堟湰锛歨dl_lib_v1.7.0.20200601_beta
+1.濡傛灉娓╁害涓�0鑷姩淇敼涓�28
+
+SDK 鐗堟湰锛歨dl_lib_v1.6.9.20200316_beta
+1.澧炲姞灏忕被鏄�3鐨勯煶涔愭挱鏀惧櫒鏀寔;
+2.鍔犲湴鐑ā鍧楀崟鐙帶鍒舵俯搴︽帴鍙ｏ紝鎺ュ彛鑷姩鏍规嵁褰撳墠妯″紡璁剧疆褰撳墠妯″紡鐨勬俯搴﹀弬鏁帮紝涓嶉渶瑕佷笂灞傝嚜宸卞垽鏂�;(HDLCommand.geothermalCtrlTemp())
+3.澧炲姞绠�鏄撶紪绋嬫悳绱㈠洖澶�,閫氳繃閰嶇疆澶х被灏忕被锛岃澹板繀鍙澶囨ā鎷熸垚绗笁鏂归煶涔愭挱鏀惧櫒琚悳绱� ;
+//閰嶇疆绠�鏄撶紪绋嬫悳绱㈢殑鍙傛暟 (SDK 鍒濆鍖栫殑鏃跺�欓厤缃竴娆�)
+/**
+ * 閰嶇疆绠�鏄撶紪绋嬫悳绱㈣繑鍥炵殑榛樿鍙傛暟
+ * @param mSDKLocalBigClass 澶х被ID
+ * @param mSDKLocalSmallClass 灏忕被ID
+ * @param mSDKLocalRemark 澶囨敞
+ */
+public static void setEasyProgrammingSearchLocalData(int mSDKLocalBigClass, int mSDKLocalSmallClass, String mSDKLocalRemark);
+澹板繀鍙澶噑etEasyProgrammingSearchLocalData(9,1,"澹板繀鍙煶涔�");
+
+鍘熷湴鐑搴斿叧绯�
+HDL 澹板繀鍙�
+鏅�� 鑷姩
+鐧藉ぉ 鎵嬪姩
+绂诲紑 浼戠湢
+2020-03-15 淇敼涓�
+HDL 澹板繀鍙�
+鏅�� 鎵嬪姩
+鐧藉ぉ 鑷姩
+绂诲紑 浼戠湢
+
+SDK 鐗堟湰锛歨dl_lib_v1.6.9.20200118_beta
+1.淇RCU娣峰悎璋冨厜娣峰悎寮�鍏� 绫绘ā鍧楋紝浣跨敤鐗╃悊鍥炶矾闂;
+2.澧炲姞榛樿鑾峰彇WiFi杩炴帴鐨勫箍鎾厤缃柟娉�;
+
+
+SDK 鐗堟湰锛歨dl_lib_v1.6.8.20191016_beta
+1.鎺у埗閮芥敼鎴愬箍鎾舰寮忎簡锛屼笉璁板綍涓�绔彛鐨処P銆�
+
+
+SDK 鐗堟湰锛歨dl_lib_v1.6.4.20191015_beta
+1.澧炲姞鎼滅储瀹岃澶囨垨鑰呭娉ㄥ埛鏂板畬锛岃嚜鍔ㄤ繚瀛樹竴娆℃暟鎹埌鏈湴銆�
+2.澧炲姞璇诲彇鏈湴鏁版嵁鎺ュ彛锛�
+3.澧炲姞鍒锋柊鎵�鏈夎澶囩殑澶囨敞鍜岀姸鎬佹帴鍙ｏ紱
+
+鎺ュ彛璇存槑锛�
+ /**
+ * 璇诲彇鍜屽姞杞芥湰鍦版暟鎹�
+ */
+ private void getLocalDevicesDataList() {
+ devicesDatas = HDLDeviceManager.getLocalDevicesDataList();
+ if (devicesDatas.size() > 0) {
+ updateDeviceListView();
+ HandleSearch.refreshAllDevicesStateAndRemarks();//濡傛灉鏈湴鏈夋暟鎹紝鍙互璋冪敤璇ユ柟娉曪紝閬嶅巻鍙戦�佹寚浠わ紝鍒锋柊鎵�鏈夎澶囩殑澶囨敞鍜岀姸鎬�
+ } else {
+ //showToast("鏈湴鏁版嵁涓虹┖");
+ }
+ }
+
+/**淇濆瓨鏁版嵁鍒版湰鍦版帴鍙ｏ紝闄DK鑷姩淇濆瓨鍚庯紝涓婂眰鍙互閫夋嫨鎵嬪姩璋冪敤淇濆瓨*/
+HDLDeviceManager.saveDevicesDataList();
+
+
+鎻愪緵澹板繀鍙疭DK椤圭洰
+
+##Version 1.0.2
+1.鏂板鍦扮儹妯″潡鍜屾柊椋庣郴缁熸帶鍒跺拰璇诲彇鐘舵�佹帴鍙ｏ紱
+2.鏂板鍦扮儹妯″潡鍜屾柊椋庣郴缁熸帶鍒舵紨绀洪〉闈紱
+3.targetSdkVersion 28锛�
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/SensorActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/SensorActivity.java
index 74e06f3..92e4ecf 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/SensorActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/SensorActivity.java
@@ -9,6 +9,7 @@
import com.hdl.sdk.hdl_core.HDLAppliances.Config.HDLApConfig;
+import com.hdl.sdk.hdl_core.HDLAppliances.HDLSensor.SensorStateBackInfo;
import com.hdl.sdk.hdl_core.HDLDeviceManger.Bean.AppliancesInfo;
import com.hdl.sdk.hdl_core.HDLDeviceManger.Core.HDLCommand;
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.DryContactSensorBackEvent;
@@ -56,7 +57,7 @@
initOnClick();
displayStateView();
//浠庣綉缁滀笂鏌ヨ鍒锋柊涓�娆¤澶囩姸鎬侊紝寰呰皟璇�
- HDLCommand.getDryContactSensorStateFromNetwork(appliancesInfo);
+ HDLCommand.getSensorStateFromNetwork(appliancesInfo);
}
/**
@@ -94,7 +95,7 @@
@Override
public void onClick(View view) {
//浠庣綉缁滀笂鏌ヨ鍒锋柊涓�娆¤澶囩姸鎬侊紝寰呰皟璇�
- HDLCommand.getDryContactSensorStateFromNetwork(appliancesInfo);
+ HDLCommand.getSensorStateFromNetwork(appliancesInfo);
}
});
}
@@ -102,33 +103,34 @@
private void displayStateView() {
switch (appliancesInfo.getDeviceType()) {
-// case HDLApConfig.TYPE_SENSOR_TEMP:////2019-07-03 灞忚斀
-// case HDLApConfig.TYPE_SENSOR_HUMIDITY:
-// case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
-// case HDLApConfig.TYPE_SENSOR_VOC:
-// case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
-// case HDLApConfig.TYPE_SENSOR_C02:
-// case HDLApConfig.TYPE_SENSOR_LPG:
+ case HDLApConfig.TYPE_SENSOR_TEMP:////2019-07-03 灞忚斀
+ case HDLApConfig.TYPE_SENSOR_HUMIDITY:
+ case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
+ case HDLApConfig.TYPE_SENSOR_VOC:
+ case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
+ case HDLApConfig.TYPE_SENSOR_C02:
+ case HDLApConfig.TYPE_SENSOR_LPG:
// case HDLApConfig.TYPE_SENSOR_CO_H2:
-// case HDLApConfig.TYPE_SENSOR_CH4:
+ case HDLApConfig.TYPE_SENSOR_CH4:
// case HDLApConfig.TYPE_SENSOR_SMOG:
-// case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
-// case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
-// case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
-// case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
-// case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
-// case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
-// case HDLApConfig.TYPE_SENSOR_WEIGHT:
-// case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
-// case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
-// case HDLApConfig.TYPE_SENSOR_SHAKE:
-// case HDLApConfig.TYPE_SENSOR_VOLTAGE:
-// case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
-// case HDLApConfig.TYPE_SENSOR_POWER:
+ case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
+ case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
+ case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
+ case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
+ case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
+ case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
+ case HDLApConfig.TYPE_SENSOR_WEIGHT:
+ case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
+ case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
+ case HDLApConfig.TYPE_SENSOR_SHAKE:
+ case HDLApConfig.TYPE_SENSOR_VOLTAGE:
+ case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
+ case HDLApConfig.TYPE_SENSOR_POWER:
// case HDLApConfig.TYPE_SENSOR_FLOODING:
// case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET:
// case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON:
-
+//
+// 涓嬮潰鐨勯兘鏄敤骞茶妭鐐规寚浠�
case HDLApConfig.TYPE_SENSOR_DRY_CONTACT: //骞茶妭鐐�
case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR: //绾㈠鎰熷簲浼犳劅鍣�
case HDLApConfig.TYPE_SENSOR_CO_H2: //鐓ゆ皵浼犳劅鍣�
@@ -177,29 +179,30 @@
}
-// /**
-// * 浼犳劅鍣ㄧ姸鎬佸洖璋� Event
-// *
-// * @param event
-// */
-// @Subscribe(threadMode = ThreadMode.MAIN)
-// public void onSensorStateBackInfoMain(SensorStateBackInfo event) {
-// if (event.getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
-// && event.getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
-// && event.getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum()
-// ) {
-// //杩欎釜杩斿洖鐨勪俊鎭槸褰撳墠鐘舵�佺殑
-// switch (event.getAppliancesInfo().getDeviceType()) {
-// case HDLApConfig.TYPE_SENSOR_DRY_CONTACT://2019-07-03 灞忚斀
+ /**
+ * 浼犳劅鍣ㄧ姸鎬佸洖璋� Event
+ *
+ * @param event
+ */
+ @Subscribe(threadMode = ThreadMode.MAIN)
+ public void onSensorStateBackInfoMain(SensorStateBackInfo event) {
+ if (event.getAppliancesInfo().getDeviceSubnetID() == appliancesInfo.getDeviceSubnetID()
+ && event.getAppliancesInfo().getDeviceDeviceID() == appliancesInfo.getDeviceDeviceID()
+ && event.getAppliancesInfo().getChannelNum() == appliancesInfo.getChannelNum()
+ && event.getAppliancesInfo().getDeviceType() == appliancesInfo.getDeviceType()//璁惧绫诲瀷涔熻鍖归厤瑙ｅ喅娣峰悎鍥炶矾
+ ) {
+ //杩欎釜杩斿洖鐨勪俊鎭槸褰撳墠鐘舵�佺殑
+ switch (event.getAppliancesInfo().getDeviceType()) {
+// case HDLApConfig.TYPE_SENSOR_DRY_CONTACT:
// //浼犳劅鍣� 骞叉帴鐐� 銆傚彧鏈夊紑鍏崇姸鎬�
// if (!event.isSuccess()) {
// showToast("鑾峰彇浼犳劅鍣�---骞叉帴鐐圭姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
// return;
// }
-// float dryContactValue = (float) event.getAppliancesInfo().getCurState();
+// float dryContactValue = (float) event.getAppliancesInfo().getCurStateObject();
// String dryContactUnit = ((SensorStateBackInfo) event).getUnite();
// showToast("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
-// HDLLog.Log("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
+// HDLLog.I("浼犳劅鍣�---骞叉帴鐐圭姸鎬侊細" + dryContactValue + dryContactUnit);
// break;
// case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR:
// //浼犳劅鍣� 绉诲姩鎺㈡祴 銆傜伒鏁忓害
@@ -207,274 +210,274 @@
// showToast("鑾峰彇浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︾姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
// return;
// }
-// float mdValue = (float) event.getAppliancesInfo().getCurState();
+// float mdValue = (float) event.getAppliancesInfo().getCurStateObject();
// String mdValueUnit = ((SensorStateBackInfo) event).getUnite();
// showToast("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
-// HDLLog.Log("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
+// HDLLog.I("浼犳劅鍣�---绉诲姩鎺㈡祴鐏垫晱搴︼細" + mdValue + mdValueUnit);
// break;
-// case HDLApConfig.TYPE_SENSOR_TEMP:
-// //浼犳劅鍣� 娓╁害
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---娓╁害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float tempValue = (float) event.getAppliancesInfo().getCurState();
-// String tempValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
-// HDLLog.Log("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_HUMIDITY:
-// //浼犳劅鍣� 婀垮害
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---婀垮害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float humidityValue = (float) event.getAppliancesInfo().getCurState();
-// String humidityValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
-// HDLLog.Log("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
-// //浼犳劅鍣� 鐓у害
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---鐓у害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float illuminaceValue = (float) event.getAppliancesInfo().getCurState();
-// String illuminaceValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
-// HDLLog.Log("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_VOC:
-// //浼犳劅鍣� 褰撳墠绌烘皵璐ㄩ噺绛夌骇
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float vocValue = (float) event.getAppliancesInfo().getCurState();
-// String vocValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
-// HDLLog.Log("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
-// //浼犳劅鍣� pm2.5
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---pm2.5鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float pm2_5Value = (float) event.getAppliancesInfo().getCurState();
-// String pm2_5ValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
-// HDLLog.Log("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_C02:
-// //浼犳劅鍣� 浜屾哀鍖栫⒊
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---浜屾哀鍖栫⒊鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float co2Value = (float) event.getAppliancesInfo().getCurState();
-// String co2ValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
-// HDLLog.Log("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_LPG:
-// //浼犳劅鍣� 娑插寲鐭虫补姘�
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---娑插寲鐭虫补姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float lpgValue = (float) event.getAppliancesInfo().getCurState();
-// String lpgValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
-// HDLLog.Log("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
-// break;
+ case HDLApConfig.TYPE_SENSOR_TEMP:
+ //浼犳劅鍣� 娓╁害
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---娓╁害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float tempValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String tempValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
+ HDLLog.I("浼犳劅鍣�---娓╁害锛�" + tempValue + tempValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_HUMIDITY:
+ //浼犳劅鍣� 婀垮害
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---婀垮害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float humidityValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String humidityValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
+ HDLLog.I("浼犳劅鍣�---婀垮害锛�" + humidityValue + humidityValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
+ //浼犳劅鍣� 鐓у害
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---鐓у害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float illuminaceValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String illuminaceValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
+ HDLLog.I("浼犳劅鍣�---鐓у害锛�" + illuminaceValue + illuminaceValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_VOC:
+ //浼犳劅鍣� 褰撳墠绌烘皵璐ㄩ噺绛夌骇
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float vocValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String vocValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
+ HDLLog.I("浼犳劅鍣�---褰撳墠绌烘皵璐ㄩ噺绛夌骇锛�" + vocValue + vocValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
+ //浼犳劅鍣� pm2.5
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---pm2.5鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float pm2_5Value = (float) event.getAppliancesInfo().getCurStateObject();
+ String pm2_5ValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
+ HDLLog.I("浼犳劅鍣�---pm2.5锛�" + pm2_5Value + pm2_5ValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_C02:
+ //浼犳劅鍣� 浜屾哀鍖栫⒊
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---浜屾哀鍖栫⒊鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float co2Value = (float) event.getAppliancesInfo().getCurStateObject();
+ String co2ValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
+ HDLLog.I("浼犳劅鍣�---浜屾哀鍖栫⒊锛�" + co2Value + co2ValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_LPG:
+ //浼犳劅鍣� 娑插寲鐭虫补姘�
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---娑插寲鐭虫补姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float lpgValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String lpgValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
+ HDLLog.I("浼犳劅鍣�---娑插寲鐭虫补姘旓細" + lpgValue + lpgValueUnit);
+ break;
// case HDLApConfig.TYPE_SENSOR_CO_H2:
// //浼犳劅鍣� 浜哄伐鐓ゆ皵
// if (!event.isSuccess()) {
// showToast("鑾峰彇浼犳劅鍣�---浜哄伐鐓ゆ皵鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
// return;
// }
-// float coh2Value = (float) event.getAppliancesInfo().getCurState();
+// float coh2Value = (float) event.getAppliancesInfo().getCurStateObject();
// String coh2ValueUnit = ((SensorStateBackInfo) event).getUnite();
// showToast("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
-// HDLLog.Log("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
+// HDLLog.I("浼犳劅鍣�---浜哄伐鐓ゆ皵锛�" + coh2Value + coh2ValueUnit);
// break;
-// case HDLApConfig.TYPE_SENSOR_CH4:
-// //浼犳劅鍣� 澶╃劧姘�
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---澶╃劧姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float ch4Value = (float) event.getAppliancesInfo().getCurState();
-// String ch4ValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
-// HDLLog.Log("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
-// break;
+ case HDLApConfig.TYPE_SENSOR_CH4:
+ //浼犳劅鍣� 澶╃劧姘�
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---澶╃劧姘旂姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float ch4Value = (float) event.getAppliancesInfo().getCurStateObject();
+ String ch4ValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
+ HDLLog.I("浼犳劅鍣�---澶╃劧姘旓細" + ch4Value + ch4ValueUnit);
+ break;
// case HDLApConfig.TYPE_SENSOR_SMOG:
// //浼犳劅鍣� 鐑熼浘
// if (!event.isSuccess()) {
// showToast("鑾峰彇浼犳劅鍣�---鐑熼浘鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
// return;
// }
-// float smogValue = (float) event.getAppliancesInfo().getCurState();
+// float smogValue = (float) event.getAppliancesInfo().getCurStateObject();
// String smogValueUnit = ((SensorStateBackInfo) event).getUnite();
// showToast("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
-// HDLLog.Log("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
+// HDLLog.I("浼犳劅鍣�---鐑熼浘锛�" + smogValue + smogValueUnit);
// break;
-// case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
-// //浼犳劅鍣� 椋庨��
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---椋庨�熺姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float windSpeedValue = (float) event.getAppliancesInfo().getCurState();
-// String windSpeedValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
-// HDLLog.Log("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
-// //浼犳劅鍣� 椋庡帇
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---椋庡帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float windPressureValue = (float) event.getAppliancesInfo().getCurState();
-// String windPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
-// HDLLog.Log("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
-// //浼犳劅鍣� 娑蹭綋娴侀噺
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娴侀噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float liquidFlowValue = (float) event.getAppliancesInfo().getCurState();
-// String liquidFlowValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
-// HDLLog.Log("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
-// //浼犳劅鍣� 娑蹭綋鍘嬪姏
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---娑蹭綋鍘嬪姏鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float liquidPressureValue = (float) event.getAppliancesInfo().getCurState();
-// String liquidPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
-// HDLLog.Log("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
-// //浼犳劅鍣� 娑蹭綋娣卞害
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娣卞害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float liquidDepthValue = (float) event.getAppliancesInfo().getCurState();
-// String liquidDepthValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
-// HDLLog.Log("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
-// //浼犳劅鍣� 闆ㄩ噺
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---闆ㄩ噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float rainFallValue = (float) event.getAppliancesInfo().getCurState();
-// String rainFallValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
-// HDLLog.Log("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_WEIGHT:
-// //浼犳劅鍣� 閲嶉噺
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float weightValue = (float) event.getAppliancesInfo().getCurState();
-// String weightValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
-// HDLLog.Log("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
-// //浼犳劅鍣� 閲嶉噺
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float height_lengthValue = (float) event.getAppliancesInfo().getCurState();
-// String height_lengthValueUnit = ((SensorStateBackInfo) event).getUnite();
-// showToast("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
-// HDLLog.Log("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
-// break;
-// case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
-// //浼犳劅鍣� 鐗╀綋閫熷害
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---鐗╀綋閫熷害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float objectSpeedValue = (float) event.getAppliancesInfo().getCurState();
-// String objectSpeedUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
-// showToast("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
-// HDLLog.Log("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
-// break;
-// case HDLApConfig.TYPE_SENSOR_SHAKE:
-// //浼犳劅鍣� 闇囧姩
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---闇囧姩鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float shakeValue = (float) event.getAppliancesInfo().getCurState();
-// String shakeValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
-// showToast("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
-// HDLLog.Log("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
-// break;
-// case HDLApConfig.TYPE_SENSOR_VOLTAGE:
-// //浼犳劅鍣� 鐢靛帇
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---鐢靛帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float voltageValue = (float) event.getAppliancesInfo().getCurState();
-// String voltageValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
-// showToast("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
-// HDLLog.Log("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
-// break;
-// case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
-// //浼犳劅鍣� 鐢垫祦
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---鐢垫祦鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float electricityValue = (float) event.getAppliancesInfo().getCurState();
-// String electricityValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
-// showToast("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
-// HDLLog.Log("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
-// break;
-// case HDLApConfig.TYPE_SENSOR_POWER:
-// //浼犳劅鍣� 鍔熺巼
-// if (!event.isSuccess()) {
-// showToast("鑾峰彇浼犳劅鍣�---鍔熺巼鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
-// return;
-// }
-// float powerValue = (float) event.getAppliancesInfo().getCurState();
-// String powerValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
-// showToast("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
-// HDLLog.Log("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
-// break;
+ case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
+ //浼犳劅鍣� 椋庨��
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---椋庨�熺姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float windSpeedValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String windSpeedValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
+ HDLLog.I("浼犳劅鍣�---椋庨�燂細" + windSpeedValue + windSpeedValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
+ //浼犳劅鍣� 椋庡帇
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---椋庡帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float windPressureValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String windPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
+ HDLLog.I("浼犳劅鍣�---椋庡帇锛�" + windPressureValue + windPressureValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
+ //浼犳劅鍣� 娑蹭綋娴侀噺
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娴侀噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float liquidFlowValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String liquidFlowValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
+ HDLLog.I("浼犳劅鍣�---娑蹭綋娴侀噺锛�" + liquidFlowValue + liquidFlowValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
+ //浼犳劅鍣� 娑蹭綋鍘嬪姏
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---娑蹭綋鍘嬪姏鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float liquidPressureValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String liquidPressureValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
+ HDLLog.I("浼犳劅鍣�---娑蹭綋鍘嬪姏锛�" + liquidPressureValue + liquidPressureValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
+ //浼犳劅鍣� 娑蹭綋娣卞害
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---娑蹭綋娣卞害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float liquidDepthValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String liquidDepthValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
+ HDLLog.I("浼犳劅鍣�---娑蹭綋娣卞害锛�" + liquidDepthValue + liquidDepthValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
+ //浼犳劅鍣� 闆ㄩ噺
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---闆ㄩ噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float rainFallValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String rainFallValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
+ HDLLog.I("浼犳劅鍣�---闆ㄩ噺锛�" + rainFallValue + rainFallValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_WEIGHT:
+ //浼犳劅鍣� 閲嶉噺
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float weightValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String weightValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
+ HDLLog.I("浼犳劅鍣�---閲嶉噺锛�" + weightValue + weightValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
+ //浼犳劅鍣� 閲嶉噺
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---閲嶉噺鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float height_lengthValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String height_lengthValueUnit = ((SensorStateBackInfo) event).getUnite();
+ showToast("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
+ HDLLog.I("浼犳劅鍣�---閲嶉噺锛�" + height_lengthValue + height_lengthValueUnit);
+ break;
+ case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
+ //浼犳劅鍣� 鐗╀綋閫熷害
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---鐗╀綋閫熷害鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float objectSpeedValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String objectSpeedUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
+ showToast("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
+ HDLLog.I("浼犳劅鍣�---鐗╀綋閫熷害锛�" + objectSpeedValue + objectSpeedUnite);
+ break;
+ case HDLApConfig.TYPE_SENSOR_SHAKE:
+ //浼犳劅鍣� 闇囧姩
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---闇囧姩鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float shakeValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String shakeValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
+ showToast("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
+ HDLLog.I("浼犳劅鍣�---闇囧姩锛�" + shakeValue + shakeValueUnite);
+ break;
+ case HDLApConfig.TYPE_SENSOR_VOLTAGE:
+ //浼犳劅鍣� 鐢靛帇
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---鐢靛帇鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float voltageValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String voltageValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
+ showToast("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
+ HDLLog.I("浼犳劅鍣�---鐢靛帇锛�" + voltageValue + voltageValueUnite);
+ break;
+ case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
+ //浼犳劅鍣� 鐢垫祦
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---鐢垫祦鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float electricityValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String electricityValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
+ showToast("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
+ HDLLog.I("浼犳劅鍣�---鐢垫祦锛�" + electricityValue + electricityValueUnite);
+ break;
+ case HDLApConfig.TYPE_SENSOR_POWER:
+ //浼犳劅鍣� 鍔熺巼
+ if (!event.isSuccess()) {
+ showToast("鑾峰彇浼犳劅鍣�---鍔熺巼鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
+ return;
+ }
+ float powerValue = (float) event.getAppliancesInfo().getCurStateObject();
+ String powerValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
+ showToast("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
+ HDLLog.I("浼犳劅鍣�---鍔熺巼锛�" + powerValue + powerValueUnite);
+ break;
// case HDLApConfig.TYPE_SENSOR_FLOODING:
// //浼犳劅鍣� 姘存蹈
// if (!event.isSuccess()) {
// showToast("鑾峰彇浼犳劅鍣�---姘存蹈鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
// return;
// }
-// float floodingValue = (float) event.getAppliancesInfo().getCurState();
+// float floodingValue = (float) event.getAppliancesInfo().getCurStateObject();
// String floodingValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
// showToast("浼犳劅鍣�---姘存蹈锛�" + floodingValue + floodingValueUnite);
-// HDLLog.Log("浼犳劅鍣�---姘存蹈锛�" + floodingValue + floodingValueUnite);
+// HDLLog.I("浼犳劅鍣�---姘存蹈锛�" + floodingValue + floodingValueUnite);
// break;
// case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET:
// //浼犳劅鍣� 闂ㄧ绐楃
@@ -482,10 +485,10 @@
// showToast("鑾峰彇浼犳劅鍣�---闂ㄧ绐楃鐘舵�佸け璐ワ紝璇烽噸鏂板啀璇�");
// return;
// }
-// float doorMagnetValue = (float) event.getAppliancesInfo().getCurState();
+// float doorMagnetValue = (float) event.getAppliancesInfo().getCurStateObject();
// String doorMagnetValueUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
// showToast("浼犳劅鍣�---闂ㄧ绐楃锛�" + doorMagnetValue + doorMagnetValueUnite);
-// HDLLog.Log("浼犳劅鍣�---闂ㄧ绐楃锛�" + doorMagnetValue + doorMagnetValueUnite);
+// HDLLog.I("浼犳劅鍣�---闂ㄧ绐楃锛�" + doorMagnetValue + doorMagnetValueUnite);
// break;
// case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON:
// //浼犳劅鍣� 绱ф�ユ寜閽�
@@ -493,15 +496,15 @@
// showToast("鑾峰彇浼犳劅鍣�---绱ф�ユ寜閽姸鎬佸け璐ワ紝璇烽噸鏂板啀璇�");
// return;
// }
-// float emergencyButtonValue = (float) event.getAppliancesInfo().getCurState();
+// float emergencyButtonValue = (float) event.getAppliancesInfo().getCurStateObject();
// String emergencyButtonUnite = ((SensorStateBackInfo) event).getUnite();//鏁板�煎崟浣�
// showToast("浼犳劅鍣�---绱ф�ユ寜閽細" + emergencyButtonValue + emergencyButtonUnite);
-// HDLLog.Log("浼犳劅鍣�---绱ф�ユ寜閽細" + emergencyButtonValue + emergencyButtonUnite);
+// HDLLog.I("浼犳劅鍣�---绱ф�ユ寜閽細" + emergencyButtonValue + emergencyButtonUnite);
// break;
-//
-//
-// }
-// }
-// }
+
+
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/Config/Configuration.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/Config/Configuration.java
index 536ca77..4ab1609 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/Config/Configuration.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/Config/Configuration.java
@@ -65,6 +65,9 @@
//璇诲彇澶囨敞淇℃伅 鎼滅储澶囨敞
public static final int ReadRemark = 0x000E;
public static final int ReadRemarkACK = 0x000F;
+ //璇昏澶嘙AC
+ public static final int READ_MAC_COMMAND = 0xF003;
+ public static final int READ_MAC_BACK_COMMAND = 0xF004;
//绠�鏄撶紪绋嬭澶囨悳绱㈡搷浣滅爜銆佽澶囪鍙栨搷浣滅爜
public static final int DEVICES_SEARCH_COMMAND = 0xE548;
@@ -122,9 +125,9 @@
//鍏鍙ｄ氦鎹㈡満浼犳劅鍣� 浼犳劅鍣ㄦ搷浣滅爜
- public static final int SENSOR_STATE_COMMAND = 0xE4F9;
- public static final int SENSOR_STATE_BACK_COMMAND = 0xE4FA;
-// public static final int SENSOR_BROADCAST_COMMAND = 0x1647;
+ public static final int SENSOR_STATE_COMMAND = 0xE4F9;//璇绘ā鎷熼噺
+ public static final int SENSOR_STATE_BACK_COMMAND = 0xE4FA;//璇绘ā鎷熼噺杩斿洖
+ public static final int SENSOR_BROADCAST_COMMAND = 0x353A;//妯℃嫙閲忓箍鎾�
public static final int WARNING_COMMAND = 0xF606;
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLSensor/SensorStateBackInfo.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLSensor/SensorStateBackInfo.java
index 7b0c2b8..8912ecc 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLSensor/SensorStateBackInfo.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLAppliances/HDLSensor/SensorStateBackInfo.java
@@ -4,6 +4,7 @@
import com.hdl.sdk.hdl_core.HDLDeviceManger.EventBusEvent.DeviceStateEvent;
public class SensorStateBackInfo extends DeviceStateEvent {
+ //鍗曚綅
private String unite;
public SensorStateBackInfo(AppliancesInfo appliancesInfo, boolean isSuccess) {
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
index a2a9f11..c35cd63 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLCommand.java
@@ -1255,6 +1255,76 @@
// }
+
+ /**
+ * 鑾峰彇骞叉帴鐐逛紶鎰熷櫒妯″潡鐘舵��
+ *
+ * @param info
+ */
+ public static void getSensorStateFromNetwork(final AppliancesInfo info) {
+ if (info == null) {
+ return;
+ }
+ HDLDeviceManager.isGetDeviceStateSuccess = false;
+ switch (info.getDeviceType()) {
+// case HDLApConfig.TYPE_SENSOR_DRY_CONTACT:
+// case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR:
+ case HDLApConfig.TYPE_SENSOR_TEMP:
+ case HDLApConfig.TYPE_SENSOR_HUMIDITY:
+ case HDLApConfig.TYPE_SENSOR_ILLUMINACE:
+ case HDLApConfig.TYPE_SENSOR_VOC:
+ case HDLApConfig.TYPE_SENSOR_PM_2_POINT_5:
+ case HDLApConfig.TYPE_SENSOR_C02:
+ case HDLApConfig.TYPE_SENSOR_LPG:
+// case HDLApConfig.TYPE_SENSOR_CO_H2:
+ case HDLApConfig.TYPE_SENSOR_CH4:
+// case HDLApConfig.TYPE_SENSOR_SMOG:
+ case HDLApConfig.TYPE_SENSOR_WIND_SPEED:
+ case HDLApConfig.TYPE_SENSOR_WIND_PRESSURE:
+ case HDLApConfig.TYPE_SENSOR_LIQUID_FLOW:
+ case HDLApConfig.TYPE_SENSOR_LIQUID_PRESSURE:
+ case HDLApConfig.TYPE_SENSOR_LIQUID_DEPTH:
+ case HDLApConfig.TYPE_SENSOR_RAIN_FALL:
+ case HDLApConfig.TYPE_SENSOR_WEIGHT:
+ case HDLApConfig.TYPE_SENSOR_HEIGHT_LENGTH:
+ case HDLApConfig.TYPE_SENSOR_OBJECT_SPEED:
+ case HDLApConfig.TYPE_SENSOR_SHAKE:
+ case HDLApConfig.TYPE_SENSOR_VOLTAGE:
+ case HDLApConfig.TYPE_SENSOR_ELECTRICITY:
+ case HDLApConfig.TYPE_SENSOR_POWER:
+// case HDLApConfig.TYPE_SENSOR_FLOODING:
+// case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET:
+// case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON:
+ //鍙戦�佽幏浼犳劅鍣ㄦā鍧� 妯℃嫙閲忕姸鎬佹暟鎹�
+ byte[] sendDatabyte = new byte[]{
+ (byte) info.getBigType(),
+ (byte) info.getLittleType(),
+ (byte) info.getChannelNum()
+ };
+
+ addSendData(info, sendDatabyte, Configuration.STATE);
+ break;
+ // 涓嬮潰鐨勯兘鏄敤骞茶妭鐐规寚浠�
+ case HDLApConfig.TYPE_SENSOR_DRY_CONTACT: //骞茶妭鐐�
+ case HDLApConfig.TYPE_SENSOR_MOVEMENT_DETECTOR: //绾㈠鎰熷簲浼犳劅鍣�
+ case HDLApConfig.TYPE_SENSOR_CO_H2: //鐓ゆ皵浼犳劅鍣�
+ case HDLApConfig.TYPE_SENSOR_SMOG: //鐑熼浘浼犳劅鍣�
+ case HDLApConfig.TYPE_SENSOR_FLOODING: //姘存蹈浼犳劅鍣�
+ case HDLApConfig.TYPE_SENSOR_DOOR_MAGNET: //闂ㄧ浼犳劅鍣�
+ case HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON://绱ф�ユ寜閽�
+ //鍙戦�佽幏浼犳劅鍣ㄦā鍧� 骞茶妭鐐圭姸鎬佹暟鎹�
+ byte[] sendDatabyte2 = new byte[]{
+ (byte) 1,
+ (byte) info.getChannelNum()
+ };
+ addSendData(info, sendDatabyte2, Configuration.STATE);
+ break;
+ default:
+ HDLLog.info("涓嶆槸浼犳劅鍣ㄦā鍧�");
+ break;
+ }
+ }
+
/**
* 鑾峰彇骞叉帴鐐逛紶鎰熷櫒妯″潡鐘舵��
*
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
index 8582c35..0888dc8 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
@@ -181,6 +181,9 @@
case Configuration.ReadRemark://2021-01-05 000E鎼滅储澶囨敞澶勭悊
handleReadRemarkBackData(getDatas);
break;
+ case Configuration.READ_MAC_COMMAND://2021-01-07 F003璇昏澶嘙ac
+ handleReadMacBackData(getDatas);
+ break;
// 鎺у埗璁惧
case Configuration.LIGHT_CTRL_BACK_COMMAND:
case Configuration.CURTAIN_CTRL_BACK_COMMAND:
@@ -233,8 +236,13 @@
case Configuration.LIGHT_STATE_BACK_COMMAND:
case Configuration.CURTAIN_STATE_BACK_COMMAND:
case Configuration.AIR_STATE_BACK_COMMAND:
- case Configuration.SENSOR_STATE_BACK_COMMAND:
handleStateData(getDatas);
+ break;
+ case Configuration.SENSOR_STATE_BACK_COMMAND:
+ handleSensorAnalogStateData(getDatas, true);
+ break;
+ case Configuration.SENSOR_BROADCAST_COMMAND://浼犳劅鍣ㄦā鎷熼噺骞挎挱
+ handleSensorAnalogStateData(getDatas, false);
break;
//鑾峰彇鏂伴璁惧鐘舵�� 20190709鏂板
case Configuration.FRESH_AIR_STATE_BACK_COMMAND:
@@ -400,6 +408,7 @@
/**
* ReadRemark
* 鎼滅储璁惧000E 鍥炲澶勭悊
+ *
* @param getDatas
*/
public static void handleReadRemarkBackData(UdpDataBean getDatas) {
@@ -412,6 +421,26 @@
addBytes,
getDatas.port, getDatas.ipAddress);
}
+
+ /**
+ * READ MAC
+ * 璇诲彇MAC 鍥炲澶勭悊
+ *
+ * @param getDatas
+ */
+ public static void handleReadMacBackData(UdpDataBean getDatas) {
+ //Mac鍦板潃8涓猙yte
+ byte[] addBytes = new byte[8];
+ addBytes[0] = (byte) 200;
+ //鎶婄湡瀹炵殑MAC璧嬪�肩粰addBytes
+// System.arraycopy(remarkByte, 0, addBytes, 0, Math.min(remarkByte.length, 20));
+ HDLCommand.cusSendCommand(Configuration.READ_MAC_BACK_COMMAND,
+ getDatas.sourceSubnetID,
+ getDatas.sourceDeviceID,
+ addBytes,
+ getDatas.port, getDatas.ipAddress);
+ }
+
/**
* 澶勭悊RCU鎼滅储鏁版嵁
@@ -2054,15 +2083,35 @@
// aa += (getDatas.addBytes[i] & 0xff) + ",";
// }
// HDLLog.info( aa);
- float curState;
- if (getDatas.addBytes.length >= 28) {
- curState = DataConverseUtil.byte2Float(Arrays.copyOfRange(getDatas.addBytes, 24, 27));
+ //浣跨敤骞茶妭鐐规寚浠ょ殑浼犳劅鍣�
+ if (DeviceParser.getIfDryContactSensor(infos.get(appPos).getLittleType())) {
+ //骞茶妭鐐逛紶鎰熷櫒锛岃鐗规畩澶勭悊淇敼鍥炶矾鍙�
+ int curState;
+ if (getDatas.addBytes.length >= 26) {
+ curState = (int) (getDatas.addBytes[24] & 0xff);
+ devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setChannelNum(getDatas.addBytes[25] & 0xff);
+
+ } else {
+ curState = (int) (getDatas.addBytes[getDatas.addBytes.length - 1] & 0xff);
+ }
+
+ devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(curState);
+ devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState((int) curState);
} else {
- curState = (float) (getDatas.addBytes[getDatas.addBytes.length - 1] & 0xff);
+ //鏍囧噯妯℃嫙閲忎紶鎰熷櫒
+ float curState;
+ if (getDatas.addBytes.length >= 28) {
+ curState = DataConverseUtil.byte2Float(Arrays.copyOfRange(getDatas.addBytes, 24, 27));
+
+ } else {
+ curState = (float) (getDatas.addBytes[getDatas.addBytes.length - 1] & 0xff);
+ }
+ devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(curState);
+ devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState((int) curState);
}
- devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setCurState(curState);
- devicesDataList.get(devPos).getAppliancesInfoList().get(appPos).setIntCurState((int) curState);
+
+
break;
case Configuration.FRESH_AIR_BIG_TYPE://20190711鏂板
switch (infos.get(appPos).getLittleType()) {
@@ -2248,8 +2297,40 @@
}
break;
- case Configuration.SENSOR_BIG_TYPE:
- isGetDeviceStateSuccess = true;
+
+ default:
+ HDLLog.info("handle state 娌℃湁鎵惧埌鍖归厤绫诲瀷");
+ break;
+ }
+
+ }
+ break outter;
+ }
+ }
+ }
+
+ /**
+ * 澶勭悊鍚勭浼犳劅鍣ㄦā鎷熼噺鐘舵�佹暟鎹�
+ * 2021-08-05
+ *
+ * @param getDatas
+ */
+ private static void handleSensorAnalogStateData(UdpDataBean getDatas, boolean isState) {
+ outter:
+ for (int i = 0, len = devicesDataList.size(); i < len; i++) {
+ if (devicesDataList.get(i).getSourceSubnetID() == getDatas.sourceSubnetID
+ && devicesDataList.get(i).getSourceDeviceID() == getDatas.sourceDeviceID) {
+ List<AppliancesInfo> infos = devicesDataList.get(i).getAppliancesInfoList();
+ for (int j = 0, len2 = infos.size(); j < len2; j++) {
+ if (devicesDataList.get(i).getAppliancesInfoList().get(j).getBigType() == Configuration.SENSOR_BIG_TYPE) {
+ //澶х被鏄�5 鍖归厤灏忕被浠ュ強鍥炶矾鍙�
+ if (getDatas.addBytes[0] == Configuration.SENSOR_BIG_TYPE
+ && getDatas.addBytes[1] == devicesDataList.get(i).getAppliancesInfoList().get(j).getLittleType()
+ && getDatas.addBytes[2] == devicesDataList.get(i).getAppliancesInfoList().get(j).getChannelNum()) {
+
+ if (isState) {
+ isGetDeviceStateSuccess = true;
+ }
AppliancesInfo sensorInfo = devicesDataList.get(i).getAppliancesInfoList().get(j);
float value = DataConverseUtil.byte2Float(Arrays.copyOfRange(getDatas.addBytes, 5, 8));
devicesDataList.get(i).getAppliancesInfoList().get(j).setCurState(value);
@@ -2257,8 +2338,8 @@
sensorInfo.setCurState(value);
-
String unite = "";
+ boolean ifNeedPost = true;
switch (sensorInfo.getDeviceType()) {
case HDLApConfig.TYPE_SENSOR_DRY_CONTACT:
unite = "";
@@ -2398,18 +2479,18 @@
unite = "W";
break;
default:
+ ifNeedPost = false;
unite = "鏈煡鍗曚綅";
break;
}
+ if (ifNeedPost) {
+ HDLLog.info("鍙戦�佷紶鎰熷櫒閫氱煡鏇存柊");
+ EventBus.getDefault().post(new SensorStateBackInfo(sensorInfo, true, unite));
+ }
-// EventBus.getDefault().post(new DeviceStateEvent(sensorInfo, true));
- HDLLog.info("鍙戦�佷紶鎰熷櫒閫氱煡鏇存柊");
- EventBus.getDefault().post(new SensorStateBackInfo(sensorInfo, true, unite));
- break;
- default:
- HDLLog.info("handle state 娌℃湁鎵惧埌鍖归厤绫诲瀷");
- break;
+ break outter;
+ }
}
}
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java
index d2c9e09..5e732e9 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java
@@ -421,6 +421,7 @@
break;
case Configuration.DEVICES_SEARCH_COMMAND: //绠�鏄撶紪绋嬭澶囨悳绱㈡搷浣滅爜銆佽澶囪鍙栨搷浣滅爜 鍥炲
case Configuration.ReadRemark: //000E 鎼滅储鍥炲
+ case Configuration.READ_MAC_COMMAND: //F003 璇昏澶嘙ac
case Configuration.LIGHT_CTRL_BACK_COMMAND:
case Configuration.CURTAIN_CTRL_BACK_COMMAND:
case Configuration.AIR_CTRL_BACK_COMMAND:
@@ -453,7 +454,7 @@
case Configuration.WARNING_COMMAND:
case Configuration.SENSOR_STATE_BACK_COMMAND:
-
+ case Configuration.SENSOR_BROADCAST_COMMAND://2021-08-05
// case Configuration.AUDIO_CTRL_READ_COMMAND:
case Configuration.AUDIO_CTRL_READ_BACK_COMMAND:
// case Configuration.AUDIO_MenuPlay_INSTRUCTION_COMMAND:
diff --git a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java
index 0c6d8a7..af1d94d 100644
--- a/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java
+++ b/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java
@@ -204,7 +204,15 @@
}
break;
case Configuration.SENSOR_BIG_TYPE:
- if (littleType >= 0 && littleType <= 24) {
+// if (littleType >= 0 && littleType <= 27) {
+// isWant = true;
+// } else {
+// isWant = false;
+// }
+
+ //2021-08-05 澧炲姞娴峰厠浼犳劅鍣�5绉嶇被鍨嬫敮鎸� 2锛氭俯搴� 3锛氭箍搴� 5锛歍VOC 6锛歅M2.5 7锛欳O2
+ if (littleType == 0 || littleType == 1 || littleType == 2 || littleType == 3 || littleType == 5 || littleType == 6 || littleType == 7
+ || littleType == 9 || littleType == 11 || (littleType > 24 && littleType <= 27)) {
isWant = true;
} else {
isWant = false;
@@ -663,7 +671,7 @@
appliancesInfo.setIpAddress(ipAddress);
- if (littleType == 0 || littleType == 1 || littleType == 10 || littleType == 11 || littleType == 25 || littleType == 26 || littleType == 27) {
+ if (getIfDryContactSensor(littleType)) {
//骞茶妭鐐�0 绉诲姩浼犳劅鍣�1 鐓ゆ皵浼犳劅鍣�10 鐑熼浘浼犳劅鍣�11 姘存蹈25 闂ㄧ绐楃26 绱ф�ユ寜閽�27
appliancesInfo.setStateCommand(Configuration.DRY_CONTACT_STATE_COMMAND);
appliancesInfo.setStateBackCommand(Configuration.DRY_CONTACT_STATE_BACK_COMMAND);
@@ -675,9 +683,14 @@
}
-
}
+ /**
+ * 鍒ゆ柇褰撳墠灏忕被鏄惁涓轰娇鐢ㄥ共鑺傜偣鎸囦护鐨勪紶鎰熷櫒
+ */
+ public static boolean getIfDryContactSensor(int littleType){
+ return (littleType == 0 || littleType == 1 || littleType == 10 || littleType == 11 || littleType == 25 || littleType == 26 || littleType == 27);
+ }
/**
*鍦扮儹
--
Gitblit v1.8.0