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,536 Commits
17 Branches
1 Tag
57 MiB
Commit Graph

584 Commits (7b46769a1674a59d4e243c1f3b6d8b481099b645)

Author SHA1 Message Date
648540858 2cf7178cb7 Merge branch 'refs/heads/2.7.1' 2024-06-11 10:14:14 +08:00
648540858 f8ef14bfea 修复移动位置位置订阅上报间隔为0的bug 2024-06-11 10:08:13 +08:00
hexq 09efdef4ce 解决MacOS 14寸 M2：最新Chrome国标设备通道“直播”Jessibuca播放下方出现黑屏的兼容BUG 2024-05-16 13:25:06 +08:00
BradyXu 7565b2ea77 fix 优化及联本地IP选择 2024-05-15 23:28:38 +08:00
BradyXu a8c424e49d 修复sip绑定监听多网卡IP时，新增上级平台新增失败的问题，本地IP改成从配置的多IP下拉选择 2024-05-12 02:00:55 +08:00
648540858 fa8ff09b42 新功能-云端录像列表支持下载 2024-04-30 17:53:31 +08:00
648540858 69185d3db8 修复云端录像下载 2024-04-30 17:51:15 +08:00
648540858 2ae4226e89 修复云端录像按年月查询时时间条件错误的BUG 2024-04-30 15:45:39 +08:00
648540858 78c2b5a63d 修复云端录像详情页时间显示错误 2024-04-30 15:36:32 +08:00
648540858 b6e604f244 修改云端录像详情页使用直接访问zlm的方式播放录像 2024-04-30 15:20:03 +08:00
648540858 d41d6b34af Merge branch 'refs/heads/2.7.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/SendRtpItem.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/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/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZlmHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/IDeviceChannelService.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceChannelServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGbPlayMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
 2024-04-23 20:59:20 +08:00
648540858 313243195e 修复通道位置的展示 2024-04-17 17:56:36 +08:00
648540858 0f4b5eed7d 优化apikey列表样式 2024-04-10 23:09:28 +08:00
648540858 b45d71ba6d
Merge pull request #1389 from ancienter/develop-add-api-key 
[add]新增ApiKey管理功能
 2024-04-10 22:56:14 +08:00
648540858 31be0a3874 更新webrtc调用 2024-04-10 22:44:19 +08:00
leesam 16b7e4a7ef Merge branch 'refs/heads/master' into develop-add-api-key 2024-04-10 20:49:44 +08:00
648540858 b1b6fae22c Merge branch 'master' into dev/zlm 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisPushStreamCloseResponseListener.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisStreamMsgListener.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
 2024-04-09 10:35:11 +08:00
ancienter 25ff2fc4ef
Merge branch '648540858:master' into develop-add-api-key 2024-04-09 09:52:23 +08:00
648540858 a890b62fa1 Merge branch '2.7.0' 2024-04-08 18:13:33 +08:00
648540858 48351c875e 国标级联支持制定200OK中sdp的IP 2024-04-08 18:13:15 +08:00
648540858 b7b950ec8b 支持展示abl-logo 2024-04-01 16:47:45 +08:00
648540858 0324855190 Merge branch 'master' into dev/abl支持 2024-03-29 22:55:09 +08:00
648540858 d34371a9f9 优化通道列表按钮排列 2024-03-28 23:06:27 +08:00
648540858 7dda1f6a2e Merge branch 'master' into dev/abl支持 2024-03-27 17:18:35 +08:00
648540858 e886aa4833 修复PTZType导致声音开关失效的问题 2024-03-27 11:15:35 +08:00
648540858 08696a57d3 Merge branch 'master' into dev/abl支持 2024-03-22 14:28:24 +08:00
Kairlec afed8161b1
fix webrtc player assert failed because media empty 2024-03-21 14:25:45 +08:00
648540858 181bf76862 优化节点在线状态 2024-03-20 18:54:39 +08:00
leesam 76208975bf [add]支持其他平台通过ApiKey调用系统相关接口 2024-03-19 16:53:01 +08:00
648540858 97dc926b28 调整ptzType字段名称 2024-03-18 17:41:49 +08:00
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