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
|
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 |
|
648540858
|
4446218f9e
|
修复通道导入bug
|
2023-02-20 15:21:41 +08:00 |
|
648540858
|
663130df45
|
完善支持语音对讲talk
|
2023-02-19 12:46:53 +08:00 |
|
648540858
|
7be636f8b8
|
修复更新通道是更新各个坐标系德位置信息
|
2023-02-15 18:30:35 +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
|
03ee15ece2
|
Merge pull request #741 from gaofuwang/wvp-28181-2.0
修复WVP作为下级平台接收上级平台DeviceControl、RecordInfo信令处理问题和Alarm信令上报上级平台问题
|
2023-02-09 14:13:44 +08:00 |
|
648540858
|
922a9e8b32
|
修复语音对讲返回的地址
|
2023-02-07 14:52:33 +08:00 |
|
648540858
|
c226deacff
|
修复语音对讲发送页
|
2023-02-07 10:04:15 +08:00 |
|
gaofw189
|
55ee6f5f0d
|
修复WVP作为下级平台接受devicecontrol命令处理-调试修改逻辑
|
2023-02-07 09:26:08 +08:00 |
|
gaofw189
|
25fca14e62
|
修复WVP作为下级平台接受deviceControl指令的问题-修复指令响应
|
2023-02-06 10:35:32 +08:00 |
|
gaofw189
|
7a9f001dcb
|
修复WVP作为下级平台接收上级平台DeviceControl信令不做处理的问题。
|
2023-02-02 18:21:25 +08:00 |
|
lin
|
2d492c5b6b
|
国标回放超时时间使用点播超时一样的字段
|
2023-02-01 10:09:01 +08:00 |
|
648540858
|
c19ad94c3e
|
优化目录更新，更新失败时只更新收到的内容不重置所有通道和自动拉流
|
2023-01-15 15:27:47 +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
|
fd3a4ef472
|
修复国标录像回放以及录像下载
|
2023-01-06 11:43:27 +08:00 |
|
648540858
|
09a23bc80e
|
修复布防撤防 #717
|
2023-01-05 17:49:34 +08:00 |
|
jiang
|
37e973949f
|
优化兼容接口
|
2022-12-28 10:58:48 +08:00 |
|
648540858
|
276f077dc7
|
优化接口
|
2022-12-23 16:52:30 +08:00 |
|
648540858
|
c1145a8163
|
优化级联注册，以及sip日志
|
2022-12-12 10:28:36 +08:00 |
|
648540858
|
131ea77669
|
接口使用旧的stream信息，支持使用远程ip端口做为回复的地址而不是使用sip中的地址
|
2022-12-06 10:33:43 +08:00 |
|
648540858
|
6c9d6f0054
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisAlarmMsgListener.java
|
2022-11-29 13:16:20 +08:00 |
|
648540858
|
f89491ada3
|
修复单端口模式下ssrc的释放 #667
|
2022-11-25 14:38:46 +08:00 |
|
648540858
|
12fa3b4c8d
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
|
2022-11-23 09:57:17 +08:00 |
|
648540858
|
278264a2c6
|
优化拉流代理注释
|
2022-11-22 17:30:49 +08:00 |
|
648540858
|
1983b8b0a7
|
国标级联->选择通道支持移除目前下所有以及全部添加到目录下
|
2022-11-22 12:55:29 +08:00 |
|
648540858
|
8cab9f23b0
|
修复使用来源IP作为流ip配置
|
2022-11-21 10:07:27 +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 |
|
648540858
|
23710f1c64
|
优化多网卡下的localIp获取
|
2022-11-17 17:01:54 +08:00 |
|
648540858
|
d340a37a00
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# 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/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-11-17 11:31:30 +08:00 |
|
648540858
|
694076dc8c
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|
648540858
|
8870f5f5a1
|
优化使用来源ip作为流ip
|
2022-11-10 09:40:01 +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 |
|
WuPeng
|
ab909feedf
|
升级Fastjson到Fastjson2
|
2022-11-05 20:49:56 +08:00 |
|
648540858
|
aed45e0f0d
|
优化多网卡
|
2022-10-28 16:40:12 +08:00 |
|
648540858
|
1ab73f69eb
|
支持多网卡
|
2022-10-26 17:15:29 +08:00 |
|
648540858
|
958474c646
|
首页改造完成,添加系统信息
|
2022-10-24 18:14:31 +08:00 |
|
648540858
|
ca891f367c
|
首页改造完成,待添加系统信息
|
2022-10-24 15:20:35 +08:00 |
|
648540858
|
3ffe205082
|
首页改造,完成cpu,内存,网络图
|
2022-10-20 18:03:40 +08:00 |
|
648540858
|
55b53caef1
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:35:44 +08:00 |
|
648540858
|
470be2dc36
|
修复开始点播功能接口调用返回参数与定义的不符 #635
|
2022-10-18 17:35:32 +08:00 |
|
648540858
|
72e91f693c
|
修复用户删除失败，#636
|
2022-10-18 17:35:32 +08:00 |
|
648540858
|
82fd369ce5
|
Merge branch 'wvp-28181-2.0'
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
|
2022-10-17 16:56:13 +08:00 |
|
648540858
|
1e1364e51a
|
修复开始点播功能接口调用返回参数与定义的不符 #635
|
2022-10-17 14:33:25 +08:00 |
|
648540858
|
2f11618199
|
修复用户删除失败，#636
|
2022-10-17 14:08:44 +08:00 |
|
648540858
|
6bfd48776d
|
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/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
|
2022-10-17 12:45:56 +08:00 |
|
648540858
|
a4f48a1522
|
修复回看控制失效 #619
|
2022-09-30 17:54:58 +08:00 |
|
648540858
|
e1af52fb5e
|
更新文档
|
2022-09-30 15:51:28 +08:00 |
|