2020-06-04 1.更新。

JLChen

2020-06-04 9c2506577fc035855f8e23ac8b3f8fcab8c09eb5

 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;
    }