256 Commits

Author	SHA1	Message	Date
Kairlec	afed8161b1	fix webrtc player assert failed because media empty	2024-03-21 14:25:45 +08:00
648540858	010e73b0c7	修复弹窗播放和分屏播放窗口尺寸异常的BUG	2024-03-11 22:56:24 +08:00
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
648540858	f6c48588da	支持支持主码流子码流切换	2024-02-22 17:22:28 +08:00
648540858	2e7c9a7341	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.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/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/resources/all-application.yml # src/main/resources/application-dev.yml	2024-02-07 20:30:37 +08:00
648540858	88721511e7	Merge branch '2.6.9' into wvp-28181-2.0	2024-01-16 14:51:17 +08:00
648540858	9b62fbe467	优化设备编辑页面	2024-01-15 18:36:31 +08:00
648540858	67d1ff0d26	Merge branch 'wvp-28181-2.0' into feature/record ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java	2023-12-18 14:23:48 +08:00
648540858	7e136c9ac7	完成下载文件的前后调试	2023-12-06 15:11:21 +08:00
648540858	ad36354ef4	优化国标录像服务端，使用zlm新接口实现功能	2023-12-05 11:29:05 +08:00
xiaoQQya	e1d604a560	feat: 升级 Jessibuca 播放器到 2023-09-15 v3.1.36 版本，优化部分配置	2023-10-25 17:44:07 +08:00
648540858	9b036fb71d	优化云端录像页面	2023-10-18 15:33:31 +08:00
648540858	92a25393f3	基于新的云端录像实现页面功能	2023-10-17 17:55:40 +08:00
648540858	5a75381a00	基于新的云端录像结构实现国标录像	2023-10-17 15:34:01 +08:00
648540858	7de73ebd2b	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/IPlatformService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java	2023-10-11 01:36:12 +08:00
648540858	b9a33f03d6	国标级联支持添加通道后主动推动到上级	2023-09-22 17:46:31 +08:00
648540858	88350873ee	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.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/gb28181/transmit/event/request/impl/message/MessageHandlerAbstract.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/cmd/KeepaliveNotifyMessageHandler.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java	2023-09-11 11:21:50 +08:00
648540858	91e49745e4	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
648540858	becea82736	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java	2023-07-04 10:10:48 +08:00
648540858	43ef195543	Merge branch '2.6.8' into wvp-28181-2.0 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/rtp/RtpController.java	2023-07-03 16:54:09 +08:00
648540858	4604aaea99	优化语音对讲支持根据设备设置释放收到ACK后开始发流	2023-07-02 13:53:45 +08:00
648540858	3571ca272b	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # web_src/config/index.js	2023-07-02 12:42:05 +08:00
648540858	8237cd25af	修复添加拉流代理提交错误	2023-07-01 22:50:24 +08:00
648540858	975ace051b	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java	2023-07-01 18:28:28 +08:00
648540858	b64f320805	优化发流逻辑	2023-07-01 18:10:33 +08:00
648540858	7f0be280c3	修复未验证通过的表单被应该提交	2023-06-29 11:09:41 +08:00
648540858	5a7a7a12bd	Merge branch 'wvp-28181-2.0' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/response/impl/InviteResponseProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java # src/main/java/com/genersoft/iot/vmp/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # src/main/resources/all-application.yml # web_src/config/index.js # web_src/src/components/dialog/devicePlayer.vue	2023-06-27 16:46:26 +08:00
648540858	9e28923b8c	Merge branch 'wvp-28181-2.0' into wvp-28181-2.0	2023-06-20 14:15:27 +08:00
648540858	6b3732b8c4	Merge branch '2.6.8' into wvp-28181-2.0 ... # 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	2023-06-19 20:19:31 +08:00
648540858	8942ab0112	优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范	2023-06-19 18:42:36 +08:00
‘sxh’	652489b47e	Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 ... # 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	2023-06-15 11:10:20 +08:00
‘sxh’	15df08964b	新增设备主子码流选择，默认为不开启	2023-06-15 11:00:29 +08:00
648540858	5b8ffd5b61	修复前端空指针异常 #831	2023-06-14 18:14:40 +08:00
648540858	2ef4111297	修复拉流代理的ffmpeg代理方式	2023-06-05 10:28:11 +08:00
648540858	30ae9e929f	合并主线	2023-05-25 17:28:57 +08:00
648540858	21258d6ba3	优化录像下载页面	2023-05-09 17:54:36 +08:00
648540858	a2da81f79a	支持级联国标录像下载	2023-05-09 17:31:58 +08:00
wangjunyi	8ef5e2618d	解决国标设备-通道-设备录像处的视频下载问题	2023-04-27 17:39:45 +08:00
wangjunyi	c561dda269	创建回调函数时，不可带上括号，否则会在调用此语句时，立即执行一次回调函数	2023-04-27 16:26:29 +08:00
648540858	d46fc9de82	优化下级平台自定义ssrc的情况，优化国标录像下载流程	2023-04-14 14:59:22 +08:00
648540858	b4048fbe80	合并开源主线	2023-04-04 09:09:07 +08:00
648540858	2e5d94181a	支持修改页面展示的sip ip	2023-03-31 08:56:54 +08:00
648540858	4f22994cdb	优化国标级联的更新	2023-03-25 10:04:57 +08:00
648540858	f210952ed2	优化国标级联中的通道全部导入	2023-03-22 15:21:22 +08:00
648540858	0f3f3c077b	修复添加zlm节点使用默认值的问题 #781	2023-03-22 15:21:22 +08:00
648540858	455e58f866	优化合并对讲broadcast级联模式	2023-03-21 14:21:45 +08:00
648540858	6b1d966255	优化合并对讲broadcast级联模式	2023-03-21 10:27:07 +08:00
648540858	4362a5b499	主线合并对讲broadcast级联模式	2023-03-20 15:42:59 +08:00
648540858	26bdf2e776	Merge branch '级联' into main-dev ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.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/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java # web_src/src/components/dialog/devicePlayer.vue	2023-03-20 15:31:43 +08:00
648540858	a000ed6062	完善talk模式	2023-03-20 14:20:28 +08:00