2020-06-04 1.更新。

JLChen

2020-06-04 9c2506577fc035855f8e23ac8b3f8fcab8c09eb5

2020-06-04 1.更新。

 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>

 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("本地数据为空");
        }

 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"


 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)) {//判断之前是否为RUC模式
            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)) {//判断之前是否为RUC模式
                HandleSearch.curSearchMode = HandleSearch.GET_RCU_DEVICES;
                HDLUdpCore.closeSocket6000();
                HDLUdpCore.init6008();
            } else {
                HandleSearch.curSearchMode = HandleSearch.GET_BUS_DEVICES;
                HDLUdpCore.closeSocket6008();
                HDLUdpCore.init6000();
            }
        }

        return devicesDataList2;
    }


 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;