Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

mk1990

2022-04-28 a0537d74df5b9c8ee65dba7c4e5bc6da7fc3d031

 src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java

@@ -219,7 +219,8 @@
                deviceChannel.setParental(0);

            }

        } else {

            deviceChannel.setParental(Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")));

            // 由于海康会错误的发送65535作为这里的取值,所以这里除非是0否则认为是1

            deviceChannel.setParental(Integer.parseInt(XmlUtil.getText(itemDevice, "Parental")) == 1?1:0);

        }

        deviceChannel.setParentId(XmlUtil.getText(itemDevice, "ParentID"));

        String parentId = XmlUtil.getText(itemDevice, "ParentID");