guzijian / wvp-GB28181-pro · Commits

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题

由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId

fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug

Optimize play controller

添加on_record_ts事件支持

修复--重设通道多个设备注册下发生的sql错误修复