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/HDLDeviceManger/Parser/DeviceParser.java | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
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