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

1305 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
648540858
10cb58391a 修复轨迹的储存与查询展示 2022-07-04 01:08:26 +08:00
648540858
5d673fb033 修复通道数据写入数据库 2022-07-03 08:47:47 +08:00
648540858
f5fcc79a2c 优化国标树型展示 2022-07-03 07:40:54 +08:00
648540858
0da452293f Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-06-23 10:14:56 +08:00
648540858
59e0767179
Merge pull request #530 from mk1990/wvp-28181-2.0 
fix设备状态查询接口
 2022-06-22 17:43:59 +08:00
mk1990
23bd11869b 添加国标级联录像控制功能 2022-06-22 16:47:26 +08:00
mk1990
c239ee277c 添加国标级联录像控制功能 2022-06-22 16:39:07 +08:00
mk1990
5e5437b630 添加国标级联录像控制功能 2022-06-22 16:31:58 +08:00
mk1990
4b4afa4ef7 添加国标级联录像控制功能 2022-06-22 16:26:41 +08:00
mk1990
6c919937bd 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
519a08e530 添加国标级联录像控制功能 2022-06-22 14:39:57 +08:00
mk1990
2a792fffb4 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2022-06-22 14:27:33 +08:00
mk1990
9bb61a70ab 添加国标级联录像控制功能 2022-06-22 14:26:46 +08:00
mk1990
1e105fb6e1
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-06-22 13:38:25 +08:00
mk1990
0c4a8c0975 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
0e18a163ac 添加国标级联录像控制功能 2022-06-22 13:33:55 +08:00
mk1990
4d2c36edcd fix设备状态查询接口 2022-06-22 13:09:09 +08:00
648540858
74365144aa
Merge pull request #527 from BradyXs/wvp-28181-2.0 
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
 2022-06-22 10:02:53 +08:00
mk1990
8eff2f1d11 添加国标级联录像控制功能； 2022-06-22 09:08:28 +08:00
mk1990
3d6db7478d fix设备状态查询接口 2022-06-20 15:10:31 +08:00
bradyxu
072e84db19 fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题 
由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId
 2022-06-18 10:40:24 +08:00
648540858
ddfe4a7b2d
Merge pull request #524 from TristingChen/fixed--processTimeout 
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
 2022-06-17 16:05:35 +08:00
chenjialing
39a5c8e2cf fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug 2022-06-17 16:01:18 +08:00
648540858
c2faa8c3ce 显示效果优化 2022-06-15 16:04:36 +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
a9c4638c94 修复通道列表修改分页大小无效 2022-06-15 11:02:19 +08:00
648540858
5fae9a7b34 优化列表展示效果 2022-06-15 10:40:45 +08:00
648540858
c801ee6218 调整页面样式 2022-06-14 23:16:58 +08:00
648540858
31a8e6ea89 优化位置信息展示 2022-06-14 17:46:53 +08:00
648540858
9ce6045f56 更新README 2022-06-14 17:28:56 +08:00
648540858
c022213972 设备支持设置地理坐标系，并将级联输出坐标系统一为wgs84 2022-06-14 17:00:24 +08:00
648540858
be9533dead 增加版本号 2022-06-14 15:10:52 +08:00
648540858
dfd1d257e2 sql脚本补全 2022-06-14 15:09:06 +08:00
648540858
e0344ccf97 国标级联推送推流 支持多wvp间自动选择与推送 2022-06-14 14:37:34 +08:00
648540858
c827d1518b #510 jessibuca分屏监控异常 2022-06-13 23:02:53 +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
cba2e6b90b 优化wasm播放器内存占用问题 2022-06-04 23:18:01 +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
acac24f0db okhttp-digest的Maven仓库调整 #506 2022-06-03 17:07:19 +08:00
648540858
47abdde339 解决设备上线停止线程导致的报错，优化录像的获取以及通道的更新 2022-06-03 16:24:11 +08:00
648540858
d88c95f409 更新 DOCKERFILE 2022-06-02 16:01:50 +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