Commit Graph

806 Commits

Author SHA1 Message Date
mk1990
8eff2f1d11 添加国标级联录像控制功能; 2022-06-22 09:08:28 +08:00
mk1990
3d6db7478d fix设备状态查询接口 2022-06-20 15:10:31 +08:00
chenjialing
39a5c8e2cf fixed--解决ssrc默认开启失败的问题,解决信令超时设备下线的bug 2022-06-17 16:01:18 +08:00
648540858
dbe6ece653 优化播放中zlm离线判断 2022-06-15 15:06:22 +08:00
648540858
f7006e4881 修复播放中zlm离线导致的bye发送失败 2022-06-15 14:55:33 +08:00
648540858
f760134b39
Merge pull request #517 from TristingChen/optimize-play-controller
Optimize play controller
2022-06-15 14:19:33 +08:00
chenjialing
0e826e3448 优化--端口获取失败之时(如zlm连接失败),不进行invite点播消息的发送 2022-06-15 14:14:29 +08:00
chenjialing
8f7db635a3 优化----okhttp连接访问超时设置,访问异常code设置为-2 2022-06-15 14:13:43 +08:00
648540858
5fae9a7b34 优化列表展示效果 2022-06-15 10:40:45 +08:00
648540858
c022213972 设备支持设置地理坐标系,并将级联输出坐标系统一为wgs84 2022-06-14 17:00:24 +08:00
648540858
e0344ccf97 国标级联推送推流 支持多wvp间自动选择与推送 2022-06-14 14:37:34 +08:00
648540858
6d4312e383
Merge pull request #473 from AlphaWu/Zafu-Dev
添加on_record_ts事件支持
2022-06-07 11:12:22 +08:00
648540858
8a362506c6 #508 2022-06-05 12:44:30 +08:00
648540858
d3e815bf16 修复订阅超时 2022-06-04 10:18:04 +08:00
648540858
5df95ba850 级联回放增加MediaStatus消息 #377 2022-06-04 00:02:39 +08:00
648540858
19a52a20f3 固定时区为Asia/Shanghai 2022-06-03 18:52:40 +08:00
648540858
47abdde339 解决设备上线停止线程导致的报错,优化录像的获取以及通道的更新 2022-06-03 16:24:11 +08:00
648540858
9ae0691c80 优化快照的存储与显示 2022-06-02 10:55:41 +08:00
648540858
936adf31fe
Merge pull request #504 from TristingChen/fixed--reset-channel
修复--重设通道多个设备注册下发生的sql错误修复
2022-06-02 09:31:06 +08:00
chenjialing
ed2680bf03 修复--重设通道多个设备注册下发生的sql错误修复 2022-06-01 14:11:06 +08:00
648540858
9a0ea9e322 修复级联点播时海康使用自定义ssrc的情况 2022-06-01 11:35:53 +08:00
648540858
8555d64f95 修复点播超时的事件设置 2022-05-31 16:20:46 +08:00
648540858
0e2908c1be #488 2022-05-27 23:14:17 +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
mk1990
f513f5ef67 解决海康设备在实时监控模块中无法获取到通道信息 2022-05-25 14:09:43 +08:00
mk1990
4e13489366 解决设备第一次注册获取不到设备信息和通道信息的问题 2022-05-25 13:39:34 +08:00
mk1990
3c48ef8f43 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
46c77302a1
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-23 13:02:50 +08:00
648540858
a4a0394f6b
Merge pull request #487 from hotcoffie/wvp-28181-2.0
fix:之前引入了错误的DigestServerAuthenticationHelper
2022-05-23 10:39:05 +08:00
xiaoxie
6cee5a0751 fix:之前引入了错误的DigestServerAuthenticationHelper 2022-05-23 10:37:38 +08:00
648540858
cb845726f6 优化代码 2022-05-23 10:16:46 +08:00
xiaoxie
d739bfa597 处理冲突 2022-05-23 09:44:21 +08:00
xiaoxie
07fa589e06 处理冲突 2022-05-23 09:42:32 +08:00
hotcoffie
3aa2665fb2
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-23 09:15:59 +08:00
648540858
590358c313 修复国标级联录像查询 #485 2022-05-21 21:13:12 +08:00
648540858
78fac69cd5 支持sdp ip 配置为域名 2022-05-19 17:00:47 +08:00
mk1990
fe576c5838 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
mk1990
7bb38c5c7b
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 16:57:06 +08:00
648540858
d202291aa8 优化单端口下的ssrc修复 2022-05-18 16:46:09 +08:00
648540858
973e75f808 优化收到心跳的信息更新判断 2022-05-18 16:08:52 +08:00
648540858
1e75b2567f 兼容海康ssrc问题 2022-05-18 15:47:20 +08:00
mk1990
491286095c Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0 2022-05-18 14:40:32 +08:00
mk1990
6fbac144d6
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 14:36:47 +08:00
hotcoffie
1d753b48c0
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-17 11:53:42 +08:00
钢翼
debfb2222f 无认证密码时,不校验是否存在授权头 2022-05-17 08:18:38 +08:00
mk1990
e6790d88fc Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0 2022-05-16 10:14:24 +08:00
mk1990
e541341504 修改application-dev.yml 2022-05-16 10:10:50 +08:00