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

1300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f3102831f6 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-06-22 14:27:33 +08:00
mk1990
615d11145e 添加国标级联录像控制功能 2022-06-22 14:26:46 +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
341d4040e0 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
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
 2022-06-22 13:34:56 +08:00
mk1990
51aad5dda4 添加国标级联录像控制功能 2022-06-22 13:33:55 +08:00
mk1990
e1a4790ed1 fix设备状态查询接口 2022-06-22 13:09:09 +08:00
648540858
e005fbf335 Merge pull request #527 from BradyXs/wvp-28181-2.0 
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
 2022-06-22 10:02:53 +08:00
mk1990
b52863e685 添加国标级联录像控制功能； 2022-06-22 09:08:28 +08:00
mk1990
e87cd8cd91 fix设备状态查询接口 2022-06-20 15:10:31 +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
648540858
f0096af3e2 Merge pull request #524 from TristingChen/fixed--processTimeout 
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
 2022-06-17 16:05:35 +08:00
chenjialing
c8b7a182e9 fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug 2022-06-17 16:01:18 +08:00
648540858
e78986b6df 显示效果优化 2022-06-15 16:04:36 +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
0b3c76304f 修复通道列表修改分页大小无效 2022-06-15 11:02:19 +08:00
648540858
ca5f430ca4 优化列表展示效果 2022-06-15 10:40:45 +08:00
648540858
7efc326d01 调整页面样式 2022-06-14 23:16:58 +08:00
648540858
ae68ef976e 优化位置信息展示 2022-06-14 17:46:53 +08:00
648540858
3c75b19c14 更新README 2022-06-14 17:28:56 +08:00
648540858
8b0b208952 设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84 2022-06-14 17:00:24 +08:00
648540858
2c74dca22f 增加版本号 2022-06-14 15:10:52 +08:00
648540858
207af49d76 sql脚本补全 2022-06-14 15:09:06 +08:00
648540858
2a7090acd7 国标级联推送推流 支持多wvp间自动选择与推送 2022-06-14 14:37:34 +08:00
648540858
a84c1bdf85 #510 jessibuca分屏监控异常 2022-06-13 23:02:53 +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
436102469d 优化wasm播放器内存占用问题 2022-06-04 23:18:01 +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
c29f37caec okhttp-digest的Maven仓库调整 #506 2022-06-03 17:07:19 +08:00
648540858
1941e7bebc 解决设备上线停止线程导致的报错，优化录像的获取以及通道的更新 2022-06-03 16:24:11 +08:00
648540858
691f61258a 更新 DOCKERFILE 2022-06-02 16:01:50 +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
f725fac744 优化大数据下的设备树加载 2022-05-31 15:54:39 +08:00
648540858
94793cc19d #488 2022-05-27 23:14:17 +08:00