From 9c2506577fc035855f8e23ac8b3f8fcab8c09eb5 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 六月 2020 15:20:00 +0800
Subject: [PATCH] 2020-06-04 1.更新。
---
Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
index ba218f3..cd86139 100644
--- a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
+++ b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java
@@ -2564,7 +2564,7 @@
*
* @return devicesDataList
*/
- public static List<DevicesData> getLocalDevicesDataList() {
+ public static List<DevicesData> getLocalDevicesDataList(Boolean isZigbee) {
try {
String getJsonStr = SPUtils.getParam(viewContext, SPUtils.KEY_DEVICE_DATA_LIST, "").toString();
// HDLLog.I("getJsonStr: \n" + getJsonStr);
@@ -2583,16 +2583,20 @@
setRemarkList();//鍔犺浇澶囨敞list
- if (!TextUtils.isEmpty(HandleSearch.rcuIp)) {//鍒ゆ柇涔嬪墠鏄惁涓篟UC妯″紡
- HandleSearch.curSearchMode = HandleSearch.GET_RCU_DEVICES;
- HDLUdpCore.closeSocket6000();
- HDLUdpCore.init6008();
- }else {
- HandleSearch.curSearchMode = HandleSearch.GET_BUS_DEVICES;
+ if(isZigbee){
HDLUdpCore.closeSocket6008();
- HDLUdpCore.init6000();
+ HDLUdpCore.closeSocket6000();
+ }else {
+ if (!TextUtils.isEmpty(HandleSearch.rcuIp)) {//鍒ゆ柇涔嬪墠鏄惁涓篟UC妯″紡
+ HandleSearch.curSearchMode = HandleSearch.GET_RCU_DEVICES;
+ HDLUdpCore.closeSocket6000();
+ HDLUdpCore.init6008();
+ } else {
+ HandleSearch.curSearchMode = HandleSearch.GET_BUS_DEVICES;
+ HDLUdpCore.closeSocket6008();
+ HDLUdpCore.init6000();
+ }
}
-
return devicesDataList2;
}
--
Gitblit v1.8.0