2019-10-8 1.增加目标子网号设备号过滤判断 2.版本：hdl_lib_v1.6.2.20191008_beta

JLChen

2019-10-12 ab04695d3b96d3eb4cf239a4ed782af00fa34e76

2019-10-8
1.增加目标子网号设备号过滤判断
2.版本：hdl_lib_v1.6.2.20191008_beta

 app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
<resources>
    <string name="app_name">HDL_SDK</string>
    <string name="app_version">hdl_lib_v1.6.2.20190929_beta3</string>
    <string name="app_version">hdl_lib_v1.6.2.20191008_beta</string>
</resources>

 hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLDeviceManager.java

@@ -1922,10 +1922,16 @@
                                                break listRemarksOutter;
                                            }
                                        } else {
                                            HDLLog.info("不存在的设备备注，再次搜索备注。设备：子网号：" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceSubnetID()
                                                    + "设备号：" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceDeviceID()
                                                    + "回路号" + listRemarks.get(lRPos).getAppliancesInfo().getChannelNum()
                                                    + "备注：" + listRemarks.get(lRPos).getAppliancesInfo().getRemarks());
//                                            HDLLog.info("不存在的设备备注，再次搜索备注。设备：子网号：" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceSubnetID()
//                                                    + "设备号：" + listRemarks.get(lRPos).getAppliancesInfo().getDeviceDeviceID()
//                                                    + "回路号" + listRemarks.get(lRPos).getAppliancesInfo().getChannelNum()
//                                                    + "备注：" + listRemarks.get(lRPos).getAppliancesInfo().getRemarks());

                                            HDLLog.info("不存在的设备备注，再次搜索备注。再次搜索设备：子网号：" + listRemarks.get(lR2Pos).getAppliancesInfo().getDeviceSubnetID()
                                                    + "设备号：" + listRemarks.get(lR2Pos).getAppliancesInfo().getDeviceDeviceID()
                                                    + "回路号" + listRemarks.get(lR2Pos).getAppliancesInfo().getChannelNum());
//                                                    + "备注：" + listRemarks.get(lR2Pos).getAppliancesInfo().getRemarks());

                                            HandleSearch.getDevRemarks();
                                            break listRemarksOutter;
                                        }

 hdl_core/src/main/java/com/hdl/sdk/hdl_core/HDLDeviceManger/Core/HDLUdpCore.java

@@ -389,8 +389,12 @@
//        if(udpDataBean.command == Configuration.RCU_ROOM_CAST_COMMAND){
//            HDLLog.info("20d2 in "+" ip = "+udpDataBean.ipAddress);
//        }
        HandleOutsideData(targetSubnetID, targetDeviceID, command, usefulBytes, receiveBytes, udpDataBean);
        HandleInsideData(udpDataBean);

        //2019-10-8 目标子网号设备号过滤判断
        if((targetSubnetID == 0xFF && targetDeviceID == 0xFF) || (targetSubnetID == Crc.localSubnetID && targetDeviceID == Crc.localDeviceID)) {
            HandleOutsideData(targetSubnetID, targetDeviceID, command, usefulBytes, receiveBytes, udpDataBean);
            HandleInsideData(udpDataBean);
        }

    }