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

498 Commits (30ae9e929fad80f624ab632c53081db3d2dc9aec)

Author SHA1 Message Date
648540858 30ae9e929f 合并主线 2023-05-25 17:28:57 +08:00
648540858 ccecda7859
Merge pull request #845 from 648540858/wvp-28181-2.0-test 
Wvp 28181 2.0 test
 2023-05-09 17:56:29 +08:00
648540858 21258d6ba3 优化录像下载页面 2023-05-09 17:54:36 +08:00
648540858 a2da81f79a 支持级联国标录像下载 2023-05-09 17:31:58 +08:00
xiaoQQya 98bd8913e7 fix(通道快照): 修复前后端分离部署后通道快照不显示的问题 2023-05-08 16:15:50 +08:00
wangjunyi 8ef5e2618d 解决国标设备-通道-设备录像处的视频下载问题 2023-04-27 17:39:45 +08:00
wangjunyi c561dda269 创建回调函数时，不可带上括号，否则会在调用此语句时，立即执行一次回调函数 2023-04-27 16:26:29 +08:00
Kairlec ea3f899593
fix `Notification is not defined` on Android Webview or under ios16.4 
如果没有这一行import,那么使用的会是Notification Web API,这在部分场景下是不支持的,具体见[Notification浏览器兼容性](https://developer.mozilla.org/zh-CN/docs/Web/API/Notification#%E6%B5%8F%E8%A7%88%E5%99%A8%E5%85%BC%E5%AE%B9%E6%80%A7)
比如在一些使用Android Webview的浏览器或部分ios系统上会导致报错而白屏
在此处应该为使用`element-ui`的Notification组件(下面有用到注册为element-ui的Notification全局属性$notify)
 2023-04-23 17:08:53 +08:00
648540858 0f3898910c 收流时设置re_use_port参数解决端口关闭快速打开造成的端口未释放问题， 支持点播的tcp主动 2023-04-19 16:21:28 +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 58d1f0ea16 修复云端录像界面 2023-03-27 15:47:04 +08:00
648540858 3b1516afe5 优化录像配置。不再使用zlm默认的http服务器 2023-03-25 18:40:29 +08:00
648540858 4f22994cdb 优化国标级联的更新 2023-03-25 10:04:57 +08:00
648540858 f210952ed2 优化国标级联中的通道全部导入 2023-03-22 15:21:22 +08:00
xiaoQQya 219f863191 fix(国标设备): 修复设备列表云台类型不显示的问题 2023-03-22 15:21:22 +08:00
xiaoQQya aac3e95159 perf(jessibuca): 优化 videoInfo 重复 log 的问题 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 039fbf7e24 Merge branch 'talk' into main-dev 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/redis/RedisConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.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/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-03-20 14:32:53 +08:00
648540858 a000ed6062 完善talk模式 2023-03-20 14:20:28 +08:00
648540858 22a205e8fc 优化异常处理 2023-03-17 14:02:16 +08:00
648540858 c3ce2bc5d0 优化异常处理以及级联设备状态查询 2023-03-17 13:22:05 +08:00
648540858 2bf07305aa Merge branch 'wvp-28181-2.0' into wvp-jwt-token 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/resources/all-application.yml
 2023-03-15 22:58:28 +08:00
648540858 be6666db03 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-03-15 22:57:20 +08:00
648540858 5fab97cf7e 支持不同域的前后端分离部署 2023-03-15 19:05:56 +08:00
648540858 943f95ba8c 增加消息通道配置，可以通道redis在wvp上下级之间发送消息 2023-03-14 14:02:33 +08:00
xiaoQQya 84595e0c84 perf(jessibuca): 升级 jessibuca 2023-03-8 v3.1.28 版本, 修改 jessibuca 参数使用硬解码优化播放黑屏问题, https 环境下使用 WCS 硬解码, http 环境下使用 MSE 硬解码, H265 视频自动使用 wasm 软解码 2023-03-13 17:53:50 +08:00
xiaoQQya bdcd006a7e fix(jessibuca): 修复 jessibuca 组件截图报错的问题 2023-03-13 17:42:39 +08:00
648540858 a7c3cf5316 优化跨域配置，支持同域的前后端分离部署 2023-03-05 09:53:26 +08:00
648540858 420dbce900 Merge branch 'main' into 级联 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/AudioBroadcastCatch.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/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2023-02-22 18:14:53 +08:00
648540858 019d95cfba Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2023-02-22 18:08:25 +08:00
逐浪人 342361cef8
Update CloudRecordDetail.vue 
修复 download.html 找不到 的问题，它被 assist放在www目录不是 recored目录
 2023-02-11 22:08:51 +08:00
648540858 197f80581b Merge branch 'main' into main2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
 2023-02-10 16:25:33 +08:00
648540858 f2c6210539 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	doc/_content/introduction/deployment.md
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/SIPRequestProcessorParent.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-02-10 16:24:27 +08:00
648540858 ec95a42985 Merge branch 'main' into main2 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-02-10 15:54:42 +08:00
648540858 6484f52e46 同时支持打包为Jar和War 2023-02-07 20:59:33 +08:00
648540858 922a9e8b32 修复语音对讲返回的地址 2023-02-07 14:52:33 +08:00
648540858 c226deacff 修复语音对讲发送页 2023-02-07 10:04:15 +08:00
648540858 2b1f7a4739
Merge branch 'wvp-28181-2.0' into fix-269 2023-02-01 10:56:40 +08:00
648540858 dea44dcd78 Merge branch 'wvp-28181-2.0' 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/utils/SipUtils.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/resources/all-application.yml
#	web_src/src/components/dialog/devicePlayer.vue
 2023-01-13 16:21:17 +08:00
648540858 d4fdea3df9 修复国标录像查询ui 2023-01-11 10:43:56 +08:00
648540858 72a1f12208 优化国标录像UI 2023-01-10 14:01:03 +08:00
648540858 8b0662ebfe 优化国标录像下载错误提示 2023-01-10 11:36:54 +08:00
648540858 9b9a13ab36 国标录像UI重构 2023-01-09 16:31:51 +08:00
Lyon1994 aa71a33c38
[ fix bug ] 修复分屏播放无效的问题,这是一个json解析错误 2022-12-26 11:36:31 +08:00