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/build.gradle | 4 ++--
Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HandleSearch.java | 5 ++++-
Android_HDL_SDK_XW/.idea/misc.xml | 2 +-
Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java | 22 +++++++++++++---------
Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java | 6 ++++--
5 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/Android_HDL_SDK_XW/.idea/misc.xml b/Android_HDL_SDK_XW/.idea/misc.xml
index 317a96c..0d45e8d 100644
--- a/Android_HDL_SDK_XW/.idea/misc.xml
+++ b/Android_HDL_SDK_XW/.idea/misc.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="JDK" project-jdk-type="JavaSDK" />
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
</project>
\ No newline at end of file
diff --git a/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java b/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
index bc0313e..d1a37d1 100644
--- a/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
+++ b/Android_HDL_SDK_XW/app/src/main/java/com/hdl/sdk/hdl_sdk/activity/MainActivity.java
@@ -215,10 +215,12 @@
* 璇诲彇鍜屽姞杞芥湰鍦版暟鎹�
*/
private void getLocalDevicesDataList() {
- devicesDatas = HDLDeviceManager.getLocalDevicesDataList();
+ devicesDatas = HDLDeviceManager.getLocalDevicesDataList(isZigbee);
if (devicesDatas.size() > 0) {
updateDeviceListView();
- HandleSearch.refreshAllDevicesStateAndRemarks();//濡傛灉鏈湴鏈夋暟鎹紝鍙互璋冪敤璇ユ柟娉曪紝閬嶅巻鍙戦�佹寚浠わ紝鍒锋柊鎵�鏈夎澶囩殑澶囨敞鍜岀姸鎬�
+ if(!isZigbee){
+ HandleSearch.refreshAllDevicesStateAndRemarks(isZigbee);//濡傛灉鏈湴鏈夋暟鎹紝鍙互璋冪敤璇ユ柟娉曪紝閬嶅巻鍙戦�佹寚浠わ紝鍒锋柊鎵�鏈夎澶囩殑澶囨敞鍜岀姸鎬�
+ }
} else {
showToast("鏈湴鏁版嵁涓虹┖");
}
diff --git a/Android_HDL_SDK_XW/hdl_core/build.gradle b/Android_HDL_SDK_XW/hdl_core/build.gradle
index 211ac48..3c659f2 100644
--- a/Android_HDL_SDK_XW/hdl_core/build.gradle
+++ b/Android_HDL_SDK_XW/hdl_core/build.gradle
@@ -6,8 +6,8 @@
defaultConfig {
minSdkVersion 17
targetSdkVersion 28
- versionCode 1
- versionName "1.0.7"
+ versionCode 2
+ versionName "1.0.8"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
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;
}
diff --git a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HandleSearch.java b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HandleSearch.java
index 04c7bab..621d665 100644
--- a/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HandleSearch.java
+++ b/Android_HDL_SDK_XW/hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HandleSearch.java
@@ -672,7 +672,10 @@
* 鍒锋柊鎵�鏈夎澶囩姸鎬佸拰澶囨敞
* 2019-10-15
*/
- public static void refreshAllDevicesStateAndRemarks() {
+ public static void refreshAllDevicesStateAndRemarks(boolean isZigbee) {
+ if(isZigbee){
+ return;
+ }
if (isSearching) {
isRefreshAllDevicesState = false;
--
Gitblit v1.8.0