648540858
|
c4d6f74091
|
修复通道数据写入数据库
|
2022-07-03 08:47:47 +08:00 |
|
648540858
|
0fea8cf29a
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
|
mk1990
|
038ca32c56
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
8a924d10b1
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
c09c1013c4
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
b9aca76599
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
7643c7f18d
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into 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/impl/info/InfoRequestProcessor.java
|
2022-06-22 14:42:46 +08:00 |
|
mk1990
|
04f6cf77bd
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
|
mk1990
|
4dae6820ee
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 13:38:25 +08:00 |
|
mk1990
|
51aad5dda4
|
添加国标级联录像控制功能
|
2022-06-22 13:33:55 +08:00 |
|
mk1990
|
e1a4790ed1
|
fix设备状态查询接口
|
2022-06-22 13:09:09 +08:00 |
|
bradyxu
|
e5aca57579
|
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId
|
2022-06-18 10:40:24 +08:00 |
|
chenjialing
|
c8b7a182e9
|
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:01:18 +08:00 |
|
648540858
|
642407505b
|
优化播放中zlm离线判断
|
2022-06-15 15:06:22 +08:00 |
|
648540858
|
3bf7ee18e0
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
|
648540858
|
9aad3b93af
|
Merge pull request #517 from TristingChen/optimize-play-controller
Optimize play controller
|
2022-06-15 14:19:33 +08:00 |
|
chenjialing
|
85c3786eb2
|
优化--端口获取失败之时（如zlm连接失败），不进行invite点播消息的发送
|
2022-06-15 14:14:29 +08:00 |
|
chenjialing
|
5f26e92e77
|
优化----okhttp连接访问超时设置，访问异常code设置为-2
|
2022-06-15 14:13:43 +08:00 |
|
648540858
|
ca5f430ca4
|
优化列表展示效果
|
2022-06-15 10:40:45 +08:00 |
|
648540858
|
8b0b208952
|
设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84
|
2022-06-14 17:00:24 +08:00 |
|
648540858
|
2a7090acd7
|
国标级联推送推流 支持多wvp间自动选择与推送
|
2022-06-14 14:37:34 +08:00 |
|
648540858
|
1159cef1ef
|
Merge pull request #473 from AlphaWu/Zafu-Dev
添加on_record_ts事件支持
|
2022-06-07 11:12:22 +08:00 |
|
648540858
|
89648af1c3
|
#508
|
2022-06-05 12:44:30 +08:00 |
|
648540858
|
8e1f032b28
|
修复订阅超时
|
2022-06-04 10:18:04 +08:00 |
|
648540858
|
075c6ad7f8
|
级联回放增加MediaStatus消息 #377
|
2022-06-04 00:02:39 +08:00 |
|
648540858
|
d6a44a03df
|
固定时区为Asia/Shanghai
|
2022-06-03 18:52:40 +08:00 |
|
648540858
|
1941e7bebc
|
解决设备上线停止线程导致的报错，优化录像的获取以及通道的更新
|
2022-06-03 16:24:11 +08:00 |
|
648540858
|
8f9b38e1e7
|
优化快照的存储与显示
|
2022-06-02 10:55:41 +08:00 |
|
648540858
|
1a0a05431a
|
Merge pull request #504 from TristingChen/fixed--reset-channel
修复--重设通道多个设备注册下发生的sql错误修复
|
2022-06-02 09:31:06 +08:00 |
|
chenjialing
|
dcef4809bd
|
修复--重设通道多个设备注册下发生的sql错误修复
|
2022-06-01 14:11:06 +08:00 |
|
648540858
|
a287261c5d
|
修复级联点播时海康使用自定义ssrc的情况
|
2022-06-01 11:35:53 +08:00 |
|
648540858
|
7620fb951c
|
修复点播超时的事件设置
|
2022-05-31 16:20:46 +08:00 |
|
648540858
|
94793cc19d
|
#488
|
2022-05-27 23:14:17 +08:00 |
|
648540858
|
30d959b1ee
|
换种写法
|
2022-05-27 18:23:43 +08:00 |
|
chenjialing
|
574e852a53
|
修复--获取全部ssrc的缓存问题修复
|
2022-05-27 18:15:06 +08:00 |
|
648540858
|
128158dbb5
|
兼容海康信令问题 #493
|
2022-05-26 13:45:57 +08:00 |
|
648540858
|
54a69c2f74
|
兼容不规范的时间格式iso8601格式；升级fastjson版本
|
2022-05-26 12:10:46 +08:00 |
|
mk1990
|
f1dd3800ea
|
解决海康设备在实时监控模块中无法获取到通道信息
|
2022-05-25 14:09:43 +08:00 |
|
mk1990
|
6319f8f3f4
|
解决设备第一次注册获取不到设备信息和通道信息的问题
|
2022-05-25 13:39:34 +08:00 |
|
mk1990
|
59986d11ff
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-23 13:03:51 +08:00 |
|
mk1990
|
210bfa0b17
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 13:02:50 +08:00 |
|
648540858
|
0dfd27f323
|
Merge pull request #487 from hotcoffie/wvp-28181-2.0
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:39:05 +08:00 |
|
xiaoxie
|
bba1e01e1e
|
fix：之前引入了错误的DigestServerAuthenticationHelper
|
2022-05-23 10:37:38 +08:00 |
|
648540858
|
a74ef4f1e6
|
优化代码
|
2022-05-23 10:16:46 +08:00 |
|
xiaoxie
|
9caa43c6dc
|
处理冲突
|
2022-05-23 09:44:21 +08:00 |
|
xiaoxie
|
524eac68ea
|
处理冲突
|
2022-05-23 09:42:32 +08:00 |
|
hotcoffie
|
7edeb6fbe0
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-23 09:15:59 +08:00 |
|
648540858
|
e886a09596
|
修复国标级联录像查询 #485
|
2022-05-21 21:13:12 +08:00 |
|
648540858
|
998b8323f3
|
支持sdp ip 配置为域名
|
2022-05-19 17:00:47 +08:00 |
|
mk1990
|
3aacaaed58
|
Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
|
2022-05-18 16:58:26 +08:00 |
|