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

66 Commits (ecf84bb0f1952c4a044ff6c8aa18226b31593f3f)

Author SHA1 Message Date
648540858 ecf84bb0f1 合并主线 2022-11-18 21:52:02 +08:00
648540858 f223aad705 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.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/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/SubscribeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.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
 2022-11-18 18:39:44 +08:00
648540858 96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network 
# 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/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue
 2022-11-08 20:43:25 +08:00
xiaoQQya 189b6044b4 fix(devicePlayer): 修复设备视频播放页 HTTPS 环境下 WebRTC 无法播放的问题 2022-11-05 11:46:39 +08:00
648540858 aed45e0f0d 优化多网卡 2022-10-28 16:40:12 +08:00
648540858 b6bcb5f2f4 隐藏liveplayer 2022-10-19 10:28:51 +08:00
648540858 b64d701f37 隐藏liveplayer 2022-10-19 10:07:47 +08:00
648540858 4f2191dc9f 增加liveplayer播放器 2022-10-17 10:30:44 +08:00
648540858 06bbe3fe01 添加第二种语音对讲实现 2022-09-29 16:27:59 +08:00
648540858 d7a1b94f90 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.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/gb28181/transmit/event/request/impl/message/response/cmd/BroadcastResponseMessageHandler.java
 2022-09-24 21:04:58 +08:00
648540858 692f716788 优化点播时RtpServer为正常关闭的问题 2022-09-16 18:02:56 +08:00
648540858 cfe9c762d6 修复前端播放 2022-09-05 09:40:14 +08:00
648540858 03d6ad289b Merge branch 'wvp-28181-2.0' 
# 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/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
 2022-09-01 14:50:28 +08:00
648540858 9f680a2e9e 修复bug以及日志按照，错误/sip/数据库 分割 2022-08-26 18:03:09 +08:00
648540858 8f7e8efc98 合并主线 2022-08-23 11:48:31 +08:00
648540858 020f9ea8a0 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
 2022-08-23 11:01:53 +08:00
648540858 f24b6fa13f 优化国标录像的异常判断 2022-08-23 11:00:46 +08:00
648540858 ecf4fbb684 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.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/Login.vue
 2022-08-22 16:53:16 +08:00
648540858 042b28b2d6 支持全局异常和统一返回结果 2022-08-22 16:17:28 +08:00
648540858 5461b8ebf2 支持全局异常和统一返回结果，未完待续 2022-08-22 16:17:28 +08:00
648540858 116d979d87 合并主线 2022-08-09 16:58:31 +08:00
648540858 8b0ff3767b Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	sql/update.sql
#	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/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-08-09 14:41:21 +08:00
648540858 5e4a673ecc 修复视频播放点击音量报错 #557，修复编解码信息获取失败 2022-08-01 14:33:51 +08:00
648540858 cfed860667 合并主线 2022-07-12 16:54:58 +08:00
648540858 5364db2982 优化对讲逻辑 2022-07-03 22:27:04 +08:00
648540858 7609d7836c 优化对讲逻辑 2022-07-03 16:23:31 +08:00
648540858 72c1b36d6d 优化对讲逻辑 2022-07-03 00:44:36 +08:00
648540858 b6c97528ae 添加界面停止逻辑 2022-07-01 18:36:35 +08:00
648540858 07956b48df 添加界面优化接口 2022-07-01 18:26:35 +08:00
648540858 7a917ee50a 修复国标录像播放 2022-05-23 10:50:29 +08:00
648540858 ff83f2c7c8 优化播放页面 2022-05-18 10:42:27 +08:00
648540858 17f219d351 优化播放页面 2022-05-18 10:01:58 +08:00
648540858 b9ffcd1d38 修复播放页面 2022-05-18 09:57:36 +08:00
648540858 3051fc82ee 添加直接支持切换多种开源播放器 2022-05-18 09:49:25 +08:00
648540858 bfb3b4ea13 播放页面显示所有流地址 2022-05-16 17:49:44 +08:00
648540858 4d3f0a8d79 优化海康国标录像播放的控制 2022-05-13 15:41:50 +08:00
648540858 1757203202 支持海康摄像头国标录像查看播放 2022-05-13 15:32:30 +08:00
xiaoxie 6e4fc1e79b 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 
1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖）
1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因）
2.调整滚动条美化样式到app.vue中，使其真正全局生效
 2022-04-23 23:34:36 +08:00
648540858 ba8633e99a 优化地图-添加地图页面以及设备树 2022-04-08 18:09:23 +08:00
648540858 3eef73ecb6 修复实时监控无法播放问题 #427 2022-04-02 18:19:12 +08:00
648540858 7d9cc96ef5 优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。 2022-03-25 16:05:14 +08:00
648540858 2eb1ca2d94 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
648540858 33a5911f94 优化回放控制界面 2021-11-25 16:28:52 +08:00
648540858 d87ff7bf4d 添加回放控制界面，优化录像查询接口 2021-11-24 18:48:02 +08:00
648540858 dda68ac044 优化录像下载，避免wvp代理使用双份流量 2021-11-22 17:30:15 +08:00
648540858 31e340e8e2 修改云台控制接口使其更加直观 2021-11-03 14:58:48 +08:00
648540858 b922898129 修复wvp使用https时播放流地址使用wss，以使用ssl播放 2021-09-30 16:46:10 +08:00
lawrencehj 324ae744d7 增加历史媒体下载信令及API支持 2021-07-23 17:01:52 +08:00
64850858 89a9ab4534 添加zlm集群支持 2021-07-16 16:34:51 +08:00
64850858 06d78575cc 修改声音处理逻辑 2021-07-14 16:59:55 +08:00