Shikong/wvp-gb28181-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,271 Commits 2 Branches 0 Tags 42 MiB
a587383c8d
Commit Graph

859 Commits

Author SHA1 Message Date
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
mk1990
2a461af8d6 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 16:57:06 +08:00
648540858
d1c15ad520 优化单端口下的ssrc修复 2022-05-18 16:46:09 +08:00
648540858
05485f57cd 优化收到心跳的信息更新判断 2022-05-18 16:08:52 +08:00
648540858
1986a059f8 兼容海康ssrc问题 2022-05-18 15:47:20 +08:00
mk1990
bc8f03ac1d 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
ffb9174623 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-18 14:36:47 +08:00
hotcoffie
3b48a96da4 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-17 11:53:42 +08:00
钢翼
587de1b9e7 无认证密码时，不校验是否存在授权头 2022-05-17 08:18:38 +08:00
mk1990
57febb3b76 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
3cb59aa4d1 修改application-dev.yml 2022-05-16 10:10:50 +08:00
mk1990
1b72bdb1af Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-16 09:38:06 +08:00
WuPeng
b12729866e 添加on_record_ts事件支持 2022-05-13 22:22:10 +08:00
648540858
7e9e27f562 使用 java.time.Instant代替 java.util.Date 2022-05-13 22:15:31 +08:00
648540858
a14ce86632 优化录像结束发送BYE判断 2022-05-13 21:10:02 +08:00
648540858
fe029b566d 优化海康录像下载 2022-05-13 21:05:33 +08:00
648540858
84a4bc354f 去除过时注释 2022-05-13 15:45:02 +08:00
648540858
91170a292e 优化海康国标录像播放的控制 2022-05-13 15:41:50 +08:00
648540858
37c61c4fb0 支持海康摄像头国标录像查看播放 2022-05-13 15:32:30 +08:00
mk1990
8707f4110d Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-13 10:58:33 +08:00
648540858
9600c25b9a #471 2022-05-12 18:15:35 +08:00
648540858
9c1bb14286 修复缺失的设备时间 2022-05-12 17:48:52 +08:00
mk1990
df3b3965f7 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-12 16:16:55 +08:00
648540858
277c6ea039 修复代码 2022-05-12 10:48:50 +08:00
648540858
cf933d7d5e 修复新设备注册 2022-05-12 10:24:08 +08:00
648540858
d91b58de0a 修复设备缺失的数据 2022-05-11 20:22:15 +08:00
648540858
738a0ce036 优化设备在线状态 2022-05-11 18:37:24 +08:00
mk1990
0eb8962db8 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-10 18:02:09 +08:00
648540858
b3fe55709b 修复发流接口的调用 2022-05-10 11:01:33 +08:00
648540858
a5f6a0953e 优化级联点播流程 2022-05-10 10:58:26 +08:00
648540858
5548e4287f 优化推流调用 2022-05-10 09:45:09 +08:00
648540858
f4f2126452 优化目录获取并法能力 2022-05-10 09:38:05 +08:00
hotcoffie
26bc0f1afe Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-07 17:42:31 +08:00
648540858
d10aabaa5f 修复打包优化pom 2022-05-07 15:13:56 +08:00
mk1990
b18abb3ee1 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-07 11:25:13 +08:00
648540858
cba8c4ae1d Merge pull request #468 from TristingChen/resetQuery--add 
开发----增加预置位查询接口开发
 2022-05-07 09:00:22 +08:00
mk1990
80d7a0cae5 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-06 17:46:01 +08:00
chenjialing
2a948e0bee 开发----增加预置位查询接口开发 2022-05-06 17:44:56 +08:00
648540858
87d8c8ad97 去除多与引用 2022-05-06 17:29:24 +08:00
648540858
d117122e27 统一userAgent 2022-05-06 15:55:32 +08:00
hotcoffie
8bcf3458f3 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-06 10:59:33 +08:00
648540858
0dd2267bb1 使用阿里代码规范。规范代码写法 2022-05-06 10:12:34 +08:00
648540858
5b4e6acfd1 使用阿里代码规范。规范代码写法 2022-05-05 17:07:16 +08:00
648540858
b13bb09a81 规范代码写法 2022-05-05 14:36:27 +08:00
648540858
69508b1744 优化收到心跳设置设备上线的逻辑 2022-05-05 14:26:42 +08:00
mk1990
7b6e801890 Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-05 08:43:10 +08:00
xiaoxie
cffafbca54 替换一个过时的API，解决maven打包警告 2022-05-01 21:32:43 +08:00
648540858
bf2f5e93e7 添加对点播时设备自定义ssrc的支持 2022-04-28 17:28:51 +08:00
mk1990
1f12dd9f8e Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-04-28 16:32:09 +08:00
648540858
78f7f7645c Merge pull request #457 from J1031/bugfix/transaction_is_null 
修复ServerTransaction空指针异常
 2022-04-28 14:02:18 +08:00
648540858
b8e63574a5 优化对Parental字段的判断 2022-04-28 10:05:56 +08:00
648540858
dcaa8e3713 优化对Parental字段的判断 2022-04-28 09:47:46 +08:00
quangz
908e97f62b 修复ServerTransaction空指针异常 2022-04-27 18:51:47 +08:00
648540858
65d081f8c4 判空 2022-04-26 18:46:18 +08:00
648540858
5cabd8ff30 优化级联目录发送 2022-04-26 18:29:47 +08:00
648540858
19b4694d1d 行政区划作为级联数据的处理,修复设备树的显示 2022-04-26 17:24:41 +08:00
mk1990
39bddf773c Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-04-26 15:32:23 +08:00
648540858
8248c32b4b 多级虚拟组织处理修复 2022-04-25 17:13:22 +08:00