648540858 509d9b3cbb Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java		2024-02-27 10:22:13 +08:00
..
AudioBroadcastManager.java	优化合并对讲broadcast级联模式	2023-03-21 14:21:45 +08:00
CatalogDataCatch.java	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
CommonSessionManager.java	添加统一回调管理	2024-02-23 18:48:01 +08:00
RecordDataCatch.java	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
SSRCFactory.java	修复未配置sipdomain时出现异常	2024-01-29 18:05:17 +08:00
VideoStreamSessionManager.java	Merge branch 'wvp-28181-2.0' into feature/record	2023-12-18 14:23:48 +08:00