From f9d01e2084e5b53840b09f557b4e2c700c790d80 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 24 六月 2020 10:51:23 +0800
Subject: [PATCH] 2020-06-24 1.增加干节点指令处理。 （干节点0 移动传感器1 煤气传感器10 烟雾传感器11 水浸25 门磁窗磁26 紧急按钮27）
---
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Parser/DeviceParser.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 0508d49..acbcf35 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
@@ -599,7 +599,18 @@
appliancesInfo.setDeviceName("浼犳劅鍣� 鍔熺巼");
appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_POWER);
break;
-
+ case 25:
+ appliancesInfo.setDeviceName("浼犳劅鍣� 姘存蹈");
+ appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_FLOODING);
+ break;
+ case 26:
+ appliancesInfo.setDeviceName("浼犳劅鍣� 闂ㄧ绐楃");
+ appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_DOOR_MAGNET);
+ break;
+ case 27:
+ appliancesInfo.setDeviceName("浼犳劅鍣� 绱ф�ユ寜閽�");
+ appliancesInfo.setDeviceType(HDLApConfig.TYPE_SENSOR_EMERGENCY_BUTTON);
+ break;
default:
appliancesInfo.setDeviceName(Configuration.UNKNOW_TYPE);
@@ -611,8 +622,9 @@
appliancesInfo.setLittleType(littleType);
// appliancesInfo.setCtrlCommand(Configuration.LOGIC_CTRL_COMMAND);
// appliancesInfo.setCtrlBackCommand(Configuration.LOGIC_CTRL_BACK_COMMAND);
- appliancesInfo.setStateCommand(Configuration.SENSOR_STATE_COMMAND);
- appliancesInfo.setStateBackCommand(Configuration.SENSOR_STATE_BACK_COMMAND);
+
+// appliancesInfo.setStateCommand(Configuration.SENSOR_STATE_COMMAND);
+// appliancesInfo.setStateBackCommand(Configuration.SENSOR_STATE_BACK_COMMAND);
appliancesInfo.setDeviceSubnetID(devicesData.getSourceSubnetID());
appliancesInfo.setDeviceDeviceID(devicesData.getSourceDeviceID());
appliancesInfo.setParentRemarks(parentRemarks);
@@ -620,6 +632,16 @@
appliancesInfo.setIpAddress(ipAddress);
+ if (littleType == 0 || littleType == 1 || littleType == 10 || littleType == 11 || littleType == 25 || littleType == 26 || littleType == 27) {
+ //骞茶妭鐐�0 绉诲姩浼犳劅鍣�1 鐓ゆ皵浼犳劅鍣�10 鐑熼浘浼犳劅鍣�11 姘存蹈25 闂ㄧ绐楃26 绱ф�ユ寜閽�27
+ appliancesInfo.setStateCommand(Configuration.DRY_CONTACT_STATE_COMMAND);
+ appliancesInfo.setStateBackCommand(Configuration.DRY_CONTACT_STATE_BACK_COMMAND);
+ } else {
+ appliancesInfo.setStateCommand(Configuration.SENSOR_STATE_COMMAND);
+ appliancesInfo.setStateBackCommand(Configuration.SENSOR_STATE_BACK_COMMAND);
+
+ }
+
}
--
Gitblit v1.8.0