From 566ddb2ea03e2514de50f2ca861a2674f6e840ac Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期一, 27 十一月 2023 13:32:27 +0800
Subject: [PATCH] 新增科技系统、门锁、新风和地暖支持
---
HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HandleSearch.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HandleSearch.java b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HandleSearch.java
index 84d5095..f714a60 100644
--- a/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HandleSearch.java
+++ b/HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/HDLDeviceManger/Core/HandleSearch.java
@@ -43,7 +43,7 @@
private static final int SEARCH_BROACAST = 101;//骞挎挱
private static final int SEARCH_MULTICAST = 102;//缁勬挱
- private static boolean bSearchAll = true; //鏄惁鍏ㄩ儴閲嶆柊鎼滅储锛屾垨鑰呭彂鐜版柊璁惧鎼滅储
+ private static boolean bSearchAll = true; //鏄惁鍏ㄩ儴閲嶆柊鎼滅储锛屾垨鑰呭彂鐜版柊璁惧鎼滅储
/**
* 閰掑簵鎼滅储
@@ -250,7 +250,7 @@
public void run() {
if (bean.getCount() < 3) {
HDLLog.I("娌℃湁鏀跺埌鏂拌澶囷紝鍙戦�佺 " + (bean.getCount() + 1) + " 娆℃悳绱㈠懡浠�");
- secondTimeSearch(random1, random2, HDLDeviceManager.realDevicesDataList);
+ secondTimeSearch(random1, random2, (bean.getCount() + 1), HDLDeviceManager.realDevicesDataList);
} else {
if (searchTimer != null) {
searchTimer.cancel();
@@ -275,7 +275,7 @@
}
}
- }, 500, 500);
+ }, 800, 800);
}
/**
@@ -293,7 +293,7 @@
}
isRefreshAllDevicesState = false;
/*** 鍏ㄩ儴閲嶆柊鎼滅储鎵嶆竻绌簂ist鏁扮粍*/
- if(bSearchAll) {
+ if (bSearchAll) {
HDLDeviceManager.devicesDataList.clear();
HDLDeviceManager.realDevicesDataList.clear();
HDLDeviceManager.listRemarks.clear();
@@ -329,7 +329,7 @@
* @param arg2 闅忔満鏁�2
* @param devicesDataList 鎵�鏈夎澶囦俊鎭泦
*/
- public static void secondTimeSearch(byte arg1, byte arg2, List<DevicesData> devicesDataList) {
+ public static void secondTimeSearch(byte arg1, byte arg2, int countSend, List<DevicesData> devicesDataList) {
if (devicesDataList == null || devicesDataList.size() == 0) {
return;
}
@@ -375,7 +375,7 @@
sendData += (bytes[i] & 0xff) + ",";
}
}
- HDLLog.I("绗簩娆″彂閫佺殑鎼滅储鏁版嵁锛�" + sendData);
+ HDLLog.I("绗�" + countSend + "娆″彂閫佺殑鎼滅储鏁版嵁锛�" + sendData);
HDLCommand.cusSendCommand(Configuration.DEVICES_SEARCH_COMMAND, 255, 255, bytes);
}
}
@@ -477,7 +477,7 @@
}
if ((HDLDeviceManager.listRemarks != null && HDLDeviceManager.listRemarks.size() == 0) || isSearching) {
isRefreshAllDevicesState = false;
- if(HDLDeviceManager.devicesDataList != null && HDLDeviceManager.devicesDataList.size() > 0){
+ if (HDLDeviceManager.devicesDataList != null && HDLDeviceManager.devicesDataList.size() > 0) {
HandleSearch.OnDeviceListGetSuccessCallBack();
}
return;
--
Gitblit v1.8.0