优化透传数据解析

panlili2024

2024-11-08 81d297dd33911dbfdc93dbc3fa9747e511b7ce8e

 HDL_TTLSDK485/src/main/java/com/hdl/sdk/ttl/Utils/HDLUtlis/SerialPortSendAndReceiveUtil.java

@@ -169,8 +169,8 @@
            // 更新发送是否成功的信息
            SendDatas.ReceiveBytes(command, subnetID, deviceID, usefulBytes);
            //2019-8-20 增加目标子网号设备号判断
            if ((desSubnetID == 0xFF && desSubnetID == 0xFF)
                    || (desSubnetID == Crc.localSubnetID && desSubnetID == Crc.localDeviceID)) {
            /*if ((desSubnetID == 0xFF && desSubnetID == 0xFF)
                    || (desSubnetID == Crc.localSubnetID && desSubnetID == Crc.localDeviceID)) {*/
                //参数
                UdpDataBean udpDataBean = new UdpDataBean();
                udpDataBean.sourceSubnetID = subnetID;
@@ -178,11 +178,9 @@
                udpDataBean.desSubnetID = desSubnetID;
                udpDataBean.desDeviceID = desDeviceID;
                udpDataBean.command = command;

                udpDataBean.addBytes = usefulBytes;
                HDLSerialPortCore.HandleInsideData(udpDataBean);

            }

        }
    };
@@ -261,12 +259,12 @@
                        int desSubnetID = tempBytes[9] & 0xFF;
                        int desDeviceID = tempBytes[10] & 0xFF;
                        //如果不是发给自己的数据或者不是广播的数据，不处理
                        if (desSubnetID != Global.subnetID || desDeviceID != Global.deviceID) {
                        /*if (desSubnetID != Global.subnetID || desDeviceID != Global.deviceID) {
                            if (desSubnetID != 0xFF || desDeviceID != 0xFF) {
                                Log.d("串口->回复", "过滤掉=={目标子网:" + desSubnetID + ",目标设备:" + desDeviceID + "}");
                                continue;
                            }
                        }
                        }*/

                        byte[] usefulBytes = new byte[(tempBytes[2] & 0xFF) - 11];
                        // 复制附加数据