Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,300 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

554 Commits (e1d476a54a7aa72f429e41e5c2957b77edbeb0a7)

Author SHA1 Message Date
648540858 010e73b0c7 修复弹窗播放和分屏播放窗口尺寸异常的BUG 2024-03-11 22:56:24 +08:00
648540858 ad4e61d7e7 修复页面开启音频失败 2024-03-11 14:22:40 +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 33b125262b 优化jessibuca播放窗口尺寸 2024-01-31 11:07:31 +08:00
648540858 3436e73e72 修复云端录像时间显示错误 2024-01-30 10:55:41 +08:00
648540858 97a87542a6 Merge branch '2.6.9' into wvp-28181-2.0 
# Conflicts:
#	pom.xml
 2024-01-22 10:37:13 +08:00
648540858 79c8447298 支持使用多数据源 2024-01-22 00:29:09 +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 1af6324a09 优化jessibuca播放器 2024-01-08 17:30:48 +08:00
648540858 07b182da98 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/vmanager/cloudRecord/CloudRecordController.java
 2023-12-26 15:38:40 +08:00
xiaoQQya 9ae520a58a feat(channel): 新增通道支持自定义名称、位置及云台类型 2023-12-19 15:22:09 +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 92e5ed2e30 优化前端云端录像的播放 2023-12-06 16:10:32 +08:00
648540858 7e136c9ac7 完成下载文件的前后调试 2023-12-06 15:11:21 +08:00
648540858 ad36354ef4 优化国标录像服务端，使用zlm新接口实现功能 2023-12-05 11:29:05 +08:00
xiaoQQya a30ff222ec fix(player): 修复分屏页面视频无法自动播放的问题 2023-11-07 09:37:40 +08:00
xiaoQQya f78657473e fix(报警推送): 修复报警推送功能无效的问题 
该问题原因为 com.genersoft.iot.vmp.conf.GlobalResponseAdvice 类改变了 sse 响应体的数据结构，导致前端无法正确解析 sse 数据，调试后未发现 GlobalResponseAdvice 如何修改的 sse 数据结构，故根据 sse 消息体结构自定义实现了 sse 连接
 2023-11-06 20:34:58 +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 7aa8444e67 临时提交 2023-10-13 18:25:36 +08:00
648540858 e4d37864d1 开始重构云端录像继续 2023-10-13 15:26:51 +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 4df90d9ba4 Merge branch 'wvp-28181-2.0' into main-dev 2023-09-20 09:17:28 +08:00
648540858 a6fb1cdb74 修复Web页面播放国标录像无声音的问题 2023-09-11 16:17:29 +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 d739017678 适配assist新的命名规则 2023-08-31 16:41:44 +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 228c57399a 修复打开分享页需要登陆的BUG 2023-07-01 22:14:53 +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 9bd588957a 修复获取pushKey 2023-06-28 20:27:25 +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