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

413 Commits (fdc17984ef81801f1b1bfeecb8571030e2ede71a)

Author SHA1 Message Date
wangshaopeng@sunnybs.com fdc17984ef 向上级联时，若下级未设置向上推送的通道信息，上级平台刷新下级平台，报异常的问题修复 2021-03-31 16:46:28 +08:00
wangshaopeng@sunnybs.com cdcb116aa2 代码优化 2021-03-29 19:30:02 +08:00
wangshaopeng@sunnybs.com 1fe9569af2 fix #61 1、支持配置接入多台ZLM。2、播流会话数据存储到redis，防止wvp宕机后会话数据丢失。3、master合并到2.0分支。4、移除lombok。5、代码格式化。 2021-03-29 18:06:55 +08:00
wangshaopeng@sunnybs.com 19e8325ede Merge branch 'master' into wvp-28181-2.0 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/VManageBootstrap.java
#	src/main/java/com/genersoft/iot/vmp/common/VideoManagerConstants.java
#	src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/SipLayer.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.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/request/impl/MessageRequestProcessor.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/media/zlm/ZLMRTPServerFactory.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
#	src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
#	src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/utils/redis/RedisUtil.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/play/PlayController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/resources/application-dev.yml
 2021-03-29 15:50:21 +08:00
lawrencehj bd38a4ef47 实现语音广播信令（web语音推流开发中） 2021-03-29 14:44:45 +08:00
lawrencehj 31b4c30d8c 启动时清除先前注册上级平台的缓存 2021-03-29 14:44:45 +08:00
lawrencehj 56c85f5126 修正更名deviceList.vue后跳转错误 2021-03-29 14:44:45 +08:00
panlinlin 7721fa42dd 添加获取直播流的api 2021-03-29 14:44:45 +08:00
panlinlin 1bb05f3b80 重命名设备管理组件 2021-03-29 14:44:45 +08:00
panlinlin 34438befdd 解决循环依赖导致的打包失败 2021-03-29 14:44:45 +08:00
wangshaopeng@sunnybs.com 21f69db96f fix #61 1、支持配置接入多台ZLM。2、播流会话数据存储到redis，防止wvp宕机后会话数据丢失。3、代码优化。 2021-03-25 14:09:40 +08:00
648540858 bb22908cf7
Merge pull request #67 from lawrencehj/wvp-28181-2.0 
增加上级平台信令功能实现，解决上级点播的一些问题
 2021-03-24 15:39:47 +08:00
lawrencehj 2a273acd09 增加上级平台云台控制功能 2021-03-16 11:47:45 +08:00
lawrencehj 3609d36111 完成响应上级远程启动信令执行 2021-03-15 15:24:41 +08:00
lawrencehj 95889f358c 完善向上级注册/注销过程 2021-03-15 15:22:04 +08:00
lawrencehj fa98c6b8c2 修正loggor提示信息 2021-03-15 15:17:55 +08:00
lawrencehj 03ec48e32c Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0 2021-03-14 21:33:00 +08:00
lawrencehj 712b25fb6e 增加上级远程启动TeleBoot功能的支持 2021-03-14 21:25:52 +08:00
lawrencehj 968ec879f5 修正本地平台播放时上级无法点播同一流视频的问题 2021-03-14 21:23:47 +08:00
lawrencehj 8a00a036c4 优化代码 2021-03-14 21:21:51 +08:00
lawrencehj a71063dd1f 增加上级点播停止后通知设备停止推流功能，并自动与本地播放协同 2021-03-14 21:20:47 +08:00
lawrencehj 32fbfd8d1e 增加上级平台查询DeviceInfo和DeviceStatus的响应功能 2021-03-14 21:13:28 +08:00
lawrencehj a2bea34ac1 增加上级平台查询DeviceInfo和DeviceStatus的响应功能 2021-03-14 21:03:53 +08:00
lawrencehj 616e1be0b4 修复ssrc释放失败问题、修正branch字段以符合国标 2021-03-14 20:54:51 +08:00
648540858 b05ddb2003
Merge pull request #64 from lawrencehj/wvp-28181-2.0 
修正一处可能导致死循环的代码
 2021-03-10 20:43:29 +08:00
lawrencehj 2c1dbe63de 增加接收Bye请求后停止向上级推流功能 2021-03-10 14:39:40 +08:00
lawrencehj 343882e4c4 修正某些branch不符合GB之处 2021-03-10 14:38:31 +08:00
lawrencehj b01ec1d727 修正平台Keepalive错误 2021-03-10 14:37:17 +08:00
lawrencehj f840c85666 修正一处可能导致死循环的代码 2021-03-10 12:21:05 +08:00
648540858 cbd2bc8e99
Merge pull request #63 from lawrencehj/wvp-28181-2.0 
实现级联点播的RTP推送
 2021-03-10 09:35:20 +08:00
lawrencehj df34954c9e 实现级联点播RTP推送 2021-03-09 20:05:37 +08:00
lawrencehj b7857027d5 去除冗余代码和死代码 2021-03-09 20:02:56 +08:00
panlinlin 2d82d1b8ee 修复ssrc释放失败的问题 2021-03-03 10:30:06 +08:00
panlinlin 2f165d595a 对级联点播信令进行处理 2021-03-02 18:23:06 +08:00
panlinlin 418970eab2 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2021-03-01 18:13:26 +08:00
panlinlin 421c2f5602 使用jainsip的方式解析sdp 2021-03-01 18:12:56 +08:00
648540858 e361f14a96
Merge pull request #58 from lawrencehj/wvp-28181-2.0 
同步主线Alarm处理功能
 2021-03-01 09:26:32 +08:00
lawrencehj a078ace99c 同步主线Alarm处理功能 2021-02-27 19:25:28 +08:00
panlinlin d0f5d684a9 同步主线 2021-02-26 11:10:22 +08:00
panlinlin 0f58218bad Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 
# Conflicts:
#	README.md
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java
#	src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java
#	src/main/resources/wvp.sqlite
#	web_src/.postcssrc.js
#	web_src/src/components/UiHeader.vue
#	web_src/src/main.js
#	web_src/src/router/index.js
 2021-02-25 18:10:02 +08:00
648540858 e864becace
Merge pull request #52 from lawrencehj/master 
将录像文件统计改为独立线程进行，实现超时返回已接收结果，优化代码消除编译报警项
 2021-02-06 10:54:10 +08:00
lawrencehj a8603075d4 去除冗余代码，修正编译报警项 2021-02-05 15:15:39 +08:00
lawrencehj 6868577e32 将录像文件统计改为独立线程进行，实现超时返回已接收结果 2021-02-05 15:00:47 +08:00
648540858 d3fa1dd226
Merge pull request #47 from lawrencehj/master 
增加订阅与通知方法，增加移动位置支持等
 2021-02-04 10:35:02 +08:00
lawrencehj 65b4c5cec9 增加多种信令的API调用接口 2021-02-03 11:08:10 +08:00
lawrencehj c1d4e1944d 增强数据格式校验和转换功能 2021-02-03 11:05:27 +08:00
lawrencehj 18c3b59318 增加多种信令的支持 2021-02-03 11:00:24 +08:00
lawrencehj 693aac283a 调整界面布局 2021-02-03 10:54:41 +08:00
Lawrence a522d09734 修复各页面按下回车键都会退回Contral页面的问题 2021-01-28 14:26:48 +08:00
Lawrence c807572bdf 修改说明 2021-01-27 16:05:08 +08:00