From 7be166b93cafc5ba0c5cdb8ede2e4f664136e9ee Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 05 一月 2021 15:41:05 +0800
Subject: [PATCH] 2021-01-05 1.增加000E读备注回复协议
---
app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java | 2 --
hdl_core/src/main/java/com/hdl/sdk/hdl_core/Config/Configuration.java | 5 +++++
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java | 1 +
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java | 20 +++++++++++++++++++-
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
index 69bed2c..5b9f4e9 100644
--- a/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
+++ b/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
@@ -86,8 +86,6 @@
// hideTestButton();
- double AA = HDLUtlis.byteToDouble((byte)0, (byte)0, (byte)134, (byte) 160);
- HDLLog.I("byteToDouble:"+AA);
}
private void initView() {
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 859b388..536ca77 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
@@ -3,6 +3,8 @@
public class Configuration {
public static final String UNKNOW_TYPE = "Unknow Type";
public static final int HDL_SDK_DEV_TYPE = 58009;
+// public static final int HDL_SDK_DEV_TYPE = 58042;// 杩欐槸璇帶闈㈡澘鐨勮澶囩被鍨�
+
//瀹剁數绫诲瀷鐮�
//澶х被
@@ -60,6 +62,9 @@
public static final int PORT = 6000;
public static final int GET_DEVICE_FROM_BUS_PORT = 8641;
+ //璇诲彇澶囨敞淇℃伅 鎼滅储澶囨敞
+ public static final int ReadRemark = 0x000E;
+ public static final int ReadRemarkACK = 0x000F;
//绠�鏄撶紪绋嬭澶囨悳绱㈡搷浣滅爜銆佽澶囪鍙栨搷浣滅爜
public static final int DEVICES_SEARCH_COMMAND = 0xE548;
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 0254adc..8582c35 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
@@ -89,7 +89,7 @@
private static boolean isAllowEasyProgrammingSearch = false;//鏄惁鍏佽琚畝鏄撶紪绋嬫悳绱�
private static int SDKLocalBigClass = 9; //SDK 褰撳墠閰嶇疆妯℃嫙璁惧鐨勫ぇ绫伙紝榛樿涓洪煶涔愩�佽儗鏅煶涔愬姛鑳�
private static int SDKLocalSmallClass = 1; //SDK 褰撳墠閰嶇疆妯℃嫙璁惧鐨勫皬绫伙紝绗笁鏂硅儗鏅煶涔愭ā鍧�
- private static String SDKLocalRemark = "鐗规畩璁惧"; //SDK 褰撳墠閰嶇疆妯℃嫙璁惧澶囨敞
+ private static String SDKLocalRemark = "澹板繀鍙澶�"; //SDK 褰撳墠閰嶇疆妯℃嫙璁惧澶囨敞
/**
@@ -177,6 +177,9 @@
//绠�鏄撶紪绋嬭澶囨悳绱㈡搷浣滅爜銆佽澶囪鍙栨搷浣滅爜 鍥炲
case Configuration.DEVICES_SEARCH_COMMAND:
handleDeviceSearchBackData(getDatas);
+ break;
+ case Configuration.ReadRemark://2021-01-05 000E鎼滅储澶囨敞澶勭悊
+ handleReadRemarkBackData(getDatas);
break;
// 鎺у埗璁惧
case Configuration.LIGHT_CTRL_BACK_COMMAND:
@@ -394,6 +397,21 @@
}
+ /**
+ * ReadRemark
+ * 鎼滅储璁惧000E 鍥炲澶勭悊
+ * @param getDatas
+ */
+ public static void handleReadRemarkBackData(UdpDataBean getDatas) {
+ byte[] remarkByte = StringUtil.stringtoBytes(SDKLocalRemark);
+ byte[] addBytes = new byte[20];
+ System.arraycopy(remarkByte, 0, addBytes, 0, Math.min(remarkByte.length, 20));
+ HDLCommand.cusSendCommand(Configuration.ReadRemarkACK,
+ 0xFF,
+ 0xFF,
+ addBytes,
+ getDatas.port, getDatas.ipAddress);
+ }
/**
* 澶勭悊RCU鎼滅储鏁版嵁
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 4834bac..d2c9e09 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
@@ -420,6 +420,7 @@
break;
case Configuration.DEVICES_SEARCH_COMMAND: //绠�鏄撶紪绋嬭澶囨悳绱㈡搷浣滅爜銆佽澶囪鍙栨搷浣滅爜 鍥炲
+ case Configuration.ReadRemark: //000E 鎼滅储鍥炲
case Configuration.LIGHT_CTRL_BACK_COMMAND:
case Configuration.CURTAIN_CTRL_BACK_COMMAND:
case Configuration.AIR_CTRL_BACK_COMMAND:
--
Gitblit v1.8.0