-
新增设备主子码流开关选择，默认为不开启
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/utils/XmlUtil.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java # src/main/resources/all-application.yml # web_src/package-lock.json
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
-
移动设备实时位置兼容ISO8601格式
-
fix:修复拉流代理配置展示问题:音频、录制、无人观看
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
-
# Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/session/SSRCFactory.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java