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）
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java | 52 +++++++++++++++++++++++++---------------------------
1 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java
index f4ed1de..6f85fac 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/AddDevicesActivity.java
@@ -17,27 +17,30 @@
import java.util.ArrayList;
-/** SDK鐩墠鏀寔鐨勫ぇ绫伙細灏忕被
- * 鐏厜绫伙細璋冨厜鍥炶矾銆佸紑鍏冲洖璺�佹贩鍚堣皟鍏夌被銆佹贩鍚堝紑鍏崇被
- * 绐楀笜绫伙細寮�鍚堝笜鐢垫満銆佸嵎甯樼數鏈恒�佺獥甯樻ā鍧�
- * 绌鸿皟鍔熻兘锛欻VAC 妯″潡銆侀�氱敤绌鸿皟闈㈡澘
- * 鑳屾櫙闊充箰鍔熻兘锛氳儗鏅煶涔愭ā鍧� 2018鏂拌儗鏅煶涔愭ā鍧楀皬绫�3
- * 浼犳劅鍣細骞茬粨鐐�0 鍒� 鍔熺巼24
- * 閫昏緫鍔熻兘锛氶�昏緫妯″潡
- * 鍏ㄥ眬鍦烘櫙锛�
- * 鍦扮儹鍔熻兘锛氬湴鐑ā鍧�
- * 鏂伴锛氭柊椋庣郴缁�
+/** SDK鐩墠鏀寔鎵嬪姩娣诲姞鐨勫ぇ绫伙細灏忕被
+ * 鐏厜绫伙紙澶х被1锛夛細璋冨厜鍥炶矾锛�0锛夈�佸紑鍏冲洖璺紙1锛夈�佹贩鍚堣皟鍏夌被锛�9锛夈�佹贩鍚堝紑鍏崇被锛�10锛�
+ * 绐楀笜绫伙紙澶х被2锛夛細寮�鍚堝笜鐢垫満锛�0锛夈�佸嵎甯樼數鏈猴紙1锛夈�佺獥甯樻ā鍧楋紙2锛�
+ * 绌鸿皟鍔熻兘锛堝ぇ绫�7锛夛細HVAC 妯″潡锛�0锛夈�侀�氱敤绌鸿皟闈㈡澘锛�3锛�
+ * 鑳屾櫙闊充箰鍔熻兘锛堝ぇ绫�9锛夛細鑳屾櫙闊充箰妯″潡 2018鏂拌儗鏅煶涔愭ā鍧楀皬绫�3
+ * 浼犳劅鍣紙澶х被5锛夛細骞茬粨鐐�0 鍒� 鍔熺巼24
+ * 閫昏緫鍔熻兘锛堝ぇ绫�12锛夛細閫昏緫妯″潡锛�0锛�
+ * 鍏ㄥ眬鍦烘櫙锛堝ぇ绫�17锛夛細鍏ㄥ眬鍦烘櫙锛�0锛�
+ * 鍦扮儹鍔熻兘锛氬湴鐑ā鍧楋紙0锛�
+ * 鏂伴锛堝ぇ绫�19锛夛細鏂伴绯荤粺锛�0锛�
+ * 閫氱敤寮�鍏筹紙澶х被100锛夛細閫氱敤寮�鍏筹紙0锛�
- * 鐏厜绫�1锛�0 锛�1锛�9锛�10
- * 绐楀笜绫�2锛�0锛�1锛�2
- * 浼犳劅鍣�5锛�0~24
- * 绌鸿皟绫�7锛�0锛�3
- * 鍦扮儹妯″潡8锛�0
- * 鑳屾櫙闊充箰鍔熻兘9锛�0
- * 閫昏緫鍔熻兘12锛�0
- * 鍏ㄥ眬鍦烘櫙17锛�0
- * 鏂伴妯″潡19锛�0
- * 閫氱敤寮�鍏�100锛�0
+ * 鏍煎紡 鏀寔鐨勬ā鍧楀悕瀛� 澶х被ID锛氬皬绫籌D
+ *
+ * 鐏厜绫� 1锛�0 锛�1锛�9锛�10
+ * 绐楀笜绫� 2锛�0锛�1锛�2
+ * 浼犳劅鍣� 5锛�0~24
+ * 绌鸿皟绫� 7锛�0锛�3
+ * 鍦扮儹妯″潡 8锛�0
+ * 鑳屾櫙闊充箰鍔熻兘 9锛�0
+ * 閫昏緫鍔熻兘 12锛�0
+ * 鍏ㄥ眬鍦烘櫙 17锛�0
+ * 鏂伴妯″潡 19锛�0
+ * 閫氱敤寮�鍏� 100锛�0
*
* 璇ユ柟娉曞簲鐢ㄤ簬鎻愪緵椤圭洰浜や粯鍓嶇殑鎻愬彇鎵归噺鏁版嵁鐢熸垚濂芥暟鎹��
* 妯℃嫙鐢熸垚璁惧鍥炶矾鏁版嵁锛屽湪椤圭洰涓嶆敮鎸佺畝鏄撶紪绋嬫悳绱㈡儏鍐典笅锛屽彲浠ラ�氳繃璇ユ柟娉曪紝鍏堝揩鎹风敓鎴愮洰鏍囨暟鎹� 寰楀埌 List<DevicesData> 鏍煎紡鐨勮澶囧垪琛ㄦ暟鎹�
@@ -378,13 +381,8 @@
DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 3, "鐢佃鐏�", "4璺户鐢靛櫒",false);
DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 4, "寤婄伅", "4璺户鐢靛櫒",false);
-
-
- //娣诲姞涓�涓�4璺户鐢靛櫒
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 1, "鍚у彴鐏�", "4璺户鐢靛櫒",false);
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 2, "浼戦棽鐏�", "4璺户鐢靛櫒",false);
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 3, "鐢佃鐏�", "4璺户鐢靛櫒",false);
- DeviceParser.addDevicesListWithoutSearching(port, Configuration.LIGTH_BIG_TYPE, 0, 111, 3, 4, "寤婄伅", "4璺户鐢靛櫒",false);
+ //娣诲姞涓�涓共鑺傜偣浼犳劅鍣�
+ DeviceParser.addDevicesListWithoutSearching(port, Configuration.SENSOR_BIG_TYPE, 0, 111, 99, 1, "骞茶妭鐐�", "骞茶妭鐐�",false);
//娣诲姞涓�涓�2璺獥甯�
--
Gitblit v1.8.0