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

521 Commits (becea82736dcfc833d1d68021fc3baf1e23acc36)

Author SHA1 Message Date
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
winfed 1bdc0621b8
feat:删除拉流代理时，提示是否确认删除，防止误删 2023-06-09 15:50:33 +08:00
winfed a2d93fce81
fix:修复拉流代理配置展示问题:音频、录制、无人观看 2023-06-09 15:19:18 +08:00
648540858 a45fab423b 修复国标级联语音对讲 2023-06-05 15:01:20 +08:00
648540858 2ef4111297 修复拉流代理的ffmpeg代理方式 2023-06-05 10:28:11 +08:00
648540858 6bbac849b3 修复设备列表状态显示 2023-05-29 15:24:18 +08:00
648540858 d0083447bb 修复地图页面云台状态显示以及状态显示 2023-05-29 15:16:44 +08:00
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