648540858 dea44dcd78 Merge branch 'wvp-28181-2.0' ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/resources/all-application.yml # web_src/src/components/dialog/devicePlayer.vue		2023-01-13 16:21:17 +08:00
..
AudioBroadcastManager.java	设备离线清空语音对讲通道	2022-12-19 18:00:28 +08:00
CatalogDataCatch.java	【同步设备通道】第一次收到同步请求应该将通道放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道	2022-11-01 17:25:47 +08:00
RecordDataCatch.java	支持全局异常和统一返回结果，未完待续	2022-08-22 16:17:28 +08:00
SsrcConfig.java	依赖包版本升级	2022-08-19 17:11:51 +08:00
VideoStreamSessionManager.java	Merge branch 'wvp-28181-2.0'	2023-01-13 16:21:17 +08:00