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.配合海克传感器，调整处理模拟量传感器状态
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/SensorActivity.java | 579 +++++++++++++++++++++++++++++----------------------------
1 files changed, 291 insertions(+), 288 deletions(-)
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
--
Gitblit v1.8.0