aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-22 21:37:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,522 Commits 27 Branches 1 Tag 209 MiB
28f4f688dd
Commit Graph

58 Commits

Author SHA1 Message Date
648540858
28f4f688dd 优化语音遇到错误时主动终止对讲流程 2022-12-19 15:39:37 +08:00
648540858
80d96042e7 优化语音对讲 2022-11-24 20:01:03 +08:00
648540858
6b03568c5d 优化rtcp判断 2022-11-21 17:07:54 +08:00
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
ljm
c56258ba8a 【同步设备通道】第一次收到同步请求应该将通道放入 不然会造成通道数量不一致 同步时也会漏掉第一个通道 2022-11-01 17:25:47 +08:00
648540858
2ff3cdb6a1 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/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/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
 2022-09-26 11:25:53 +08:00
648540858
4c6c77be7a 异常情况打印信息优化 2022-09-23 23:15:44 +08:00
648540858
cd117ed228 dialog去除以及异常情况处理优化 2022-09-23 23:15:39 +08:00
648540858
7db2bf7b51 使用equalsIgnoreCase代替equals,忽略大小写差异 2022-09-02 10:51:55 +08:00
648540858
b46e5efad2 测试sip消息预处理 2022-09-01 22:27:18 +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
5461b8ebf2 支持全局异常和统一返回结果，未完待续 2022-08-22 16:17:28 +08:00
648540858
1a9e49d9ff 依赖包版本升级 2022-08-19 17:11:51 +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
91dc4566a2 修复级联无通道时更新停止在等待更新的问题 2022-07-25 09:44:43 +08:00
648540858
26739237e2 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 
# Conflicts:
#	sql/update.sql
#	src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.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/service/IPlayService.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	web_src/src/components/dialog/deviceEdit.vue
#	web_src/src/components/dialog/devicePlayer.vue
 2022-06-27 10:16:21 +08:00
648540858
f09f1c9a2a 换种写法 2022-05-27 18:23:43 +08:00
chenjialing
0cd9a20242 修复--获取全部ssrc的缓存问题修复 2022-05-27 18:15:06 +08:00
648540858
2a5404c68f 兼容海康信令问题 #493 2022-05-26 13:45:57 +08:00
648540858
dc6769664e 兼容不规范的时间格式iso8601格式；升级fastjson版本 2022-05-26 12:10:46 +08:00
648540858
39efda779f Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
 2022-05-16 11:47:17 +08:00
648540858
9a80e10f6e 使用 java.time.Instant代替 java.util.Date 2022-05-13 22:15:31 +08:00
648540858
98e6cf5bae 优化海康录像下载 2022-05-13 21:05:33 +08:00
648540858
1757203202 支持海康摄像头国标录像查看播放 2022-05-13 15:32:30 +08:00
648540858
f8f65d473b 优化语音广播流程 2022-05-10 13:08:32 +08:00
648540858
6e48dd3f32 Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial 
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
 2022-05-10 09:46:47 +08:00
648540858
bd21d0e391 优化目录获取并法能力 2022-05-10 09:38:05 +08:00
648540858
c2aaae9325 初步实现语音喊话 2022-05-09 18:15:30 +08:00
648540858
c286ecb455 使用阿里代码规范。规范代码写法 2022-05-05 17:07:16 +08:00
648540858
d679a9fcf8 添加对点播时设备自定义ssrc的支持 2022-04-28 17:28:51 +08:00
648540858
20622d20d6 修复更新通道状态回复不准的问题 2022-04-18 12:55:54 +08:00
648540858
b8bb9c1b74 修复更新通道结束后释放慢的问题 2022-04-18 12:42:58 +08:00
648540858
0dc1807f62 优化通道同步添加对SN的判断，精简代码 2022-04-17 19:48:05 +08:00
648540858
3955e6ed53 异步通道刷新，优化ui效果 2022-04-12 21:06:21 +08:00
648540858
c2e2e24551 优化通道刷新 2022-04-12 11:04:08 +08:00
648540858
7e755f405d 支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug 2022-04-01 16:45:29 +08:00
648540858
7d9cc96ef5 优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。 2022-03-25 16:05:14 +08:00
648540858
b2c953fc76 优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项 2022-03-07 01:17:45 +08:00
648540858
14174ff400 Merge branch 'wvp-28181-2.0' into wvp-pro-record 
# 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/ZLMHttpHookSubscribe.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
 2022-03-03 16:28:32 +08:00
648540858
2eb1ca2d94 国标录像支持多端同时播放 2022-03-03 15:57:28 +08:00
648540858
e94b99d11c 实现国标录像级联播放，优化点播流程，加快点播速度 2022-02-27 20:01:31 +08:00
648540858
726963ba77 优化通道更新逻辑 2021-12-28 18:54:50 +08:00
648540858
241804f5f8 优化redis存储，alarm默认关闭处理 2021-12-03 16:13:46 +08:00
648540858
f1217682a9 重构28181信令结构，解决循环依赖导致的无法直接注入 2021-11-05 18:27:41 +08:00
lawrencehj
99d7bea977 去除多余Import 2021-07-28 09:46:08 +08:00
64850858
3469271ec2 优化集群方案， 每个zlm一套ssrc； 
优化集群下的docker接入逻辑；
更正sql脚本；
支持重启不设置设备离线。重启SIP事务不丢失
 2021-07-26 11:40:32 +08:00
64850858
e48ef997c0 更换播放器， 修正和优化sql脚本， 2021-07-14 15:57:39 +08:00
lawrencehj
f92a5da7c2 去除多余引用 2021-06-22 12:51:56 +08:00
panlinlin
a29a0a0785 增加对设备的兼容性 2021-04-22 17:33:07 +08:00