From ab04695d3b96d3eb4cf239a4ed782af00fa34e76 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 12 十月 2019 11:39:51 +0800
Subject: [PATCH] 2019-10-8 1.增加目标子网号设备号过滤判断 2.版本：hdl_lib_v1.6.2.20191008_beta
---
app/src/main/res/values/strings.xml | 2 +-
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java | 8 ++++++--
hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java | 14 ++++++++++----
3 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 788d204..b0767ba 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
<resources>
<string name="app_name">HDL_SDK</string>
- <string name="app_version">hdl_lib_v1.6.2.20190929_beta3</string>
+ <string name="app_version">hdl_lib_v1.6.2.20191008_beta</string>
</resources>
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 3203374..7e97d83 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
@@ -1922,10 +1922,16 @@
break listRemarksOutter;
}
} else {
- HDLLog.info("涓嶅瓨鍦ㄧ殑璁惧澶囨敞锛屽啀娆℃悳绱㈠娉ㄣ�傝澶囷細瀛愮綉鍙凤細" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceSubnetID()
- + "璁惧鍙凤細" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceDeviceID()
- + "鍥炶矾鍙�" + listRemarks.get(lRPos).getAppliancesInfo().getChannelNum()
- + "澶囨敞锛�" + listRemarks.get(lRPos).getAppliancesInfo().getRemarks());
+// HDLLog.info("涓嶅瓨鍦ㄧ殑璁惧澶囨敞锛屽啀娆℃悳绱㈠娉ㄣ�傝澶囷細瀛愮綉鍙凤細" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceSubnetID()
+// + "璁惧鍙凤細" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceDeviceID()
+// + "鍥炶矾鍙�" + listRemarks.get(lRPos).getAppliancesInfo().getChannelNum()
+// + "澶囨敞锛�" + listRemarks.get(lRPos).getAppliancesInfo().getRemarks());
+
+ HDLLog.info("涓嶅瓨鍦ㄧ殑璁惧澶囨敞锛屽啀娆℃悳绱㈠娉ㄣ�傚啀娆℃悳绱㈣澶囷細瀛愮綉鍙凤細" + listRemarks.get(lR2Pos).getAppliancesInfo().getDeviceSubnetID()
+ + "璁惧鍙凤細" + listRemarks.get(lR2Pos).getAppliancesInfo().getDeviceDeviceID()
+ + "鍥炶矾鍙�" + listRemarks.get(lR2Pos).getAppliancesInfo().getChannelNum());
+// + "澶囨敞锛�" + listRemarks.get(lR2Pos).getAppliancesInfo().getRemarks());
+
HandleSearch.getDevRemarks();
break listRemarksOutter;
}
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 d2ce714..fd19b58 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
@@ -389,8 +389,12 @@
// if(udpDataBean.command == Configuration.RCU_ROOM_CAST_COMMAND){
// HDLLog.info("20d2 in "+" ip = "+udpDataBean.ipAddress);
// }
- HandleOutsideData(targetSubnetID, targetDeviceID, command, usefulBytes, receiveBytes, udpDataBean);
- HandleInsideData(udpDataBean);
+
+ //2019-10-8 鐩爣瀛愮綉鍙疯澶囧彿杩囨护鍒ゆ柇
+ if((targetSubnetID == 0xFF && targetDeviceID == 0xFF) || (targetSubnetID == Crc.localSubnetID && targetDeviceID == Crc.localDeviceID)) {
+ HandleOutsideData(targetSubnetID, targetDeviceID, command, usefulBytes, receiveBytes, udpDataBean);
+ HandleInsideData(udpDataBean);
+ }
}
--
Gitblit v1.8.0