Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-01 f3a5d0eaa481c6f565e54bde2f1690aa94cec580

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5C3CommonReportInnerFrame.java

@@ -18,6 +18,7 @@

    //  目标地址    4
    private String destinationAddress;
    private String mcuUdid;

    @Override
    public A5C3CommonReportInnerFrame transformFrame(String hex) {
@@ -34,6 +35,13 @@

        setDestinationAddress(hex.substring(8, 16));

        /**
         * 设置mcu_udid
         */
        if(getFunctionCode().equals("40")){
            setMcuUdid(hex.substring(16, hex.length() - 8));
        }

        setCrc32(hex.substring(hex.length() - 8));
        //  校验CRC32
        String frame = hex.substring(2, hex.length() - 8);