Lawrence
|
c00d51060c
|
与master分支同步
|
2021-01-12 13:50:04 +08:00 |
|
Lawrence
|
2cb73e94c5
|
进一步优化录像列表获取算法
|
2021-01-12 13:48:42 +08:00 |
|
Lawrence
|
8fb0721c7e
|
进一步优化录像列表获取算法
|
2021-01-12 13:08:51 +08:00 |
|
Lawrence
|
308b2ed8eb
|
Merge remote-tracking branch 'upstream/master'
|
2021-01-12 13:03:14 +08:00 |
|
panlinlin
|
7688a68fc2
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-12 10:48:01 +08:00 |
|
panlinlin
|
28de358c67
|
关闭播放窗口停止回放
回滚回放代码
|
2021-01-12 10:46:41 +08:00 |
|
panlinlin
|
f42790f91b
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-12 10:37:31 +08:00 |
|
panlinlin
|
a590f694f6
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-01-12 09:36:55 +08:00 |
|
Lawrence
|
211874efda
|
解决非默认端口无法Send Bye的问题
|
2021-01-11 23:40:43 +08:00 |
|
Lawrence
|
f776624d3f
|
解决非默认端口无法Send Bye的问题
|
2021-01-11 23:29:18 +08:00 |
|
648540858
|
341575181e
|
Merge pull request #33 from lawrencehj/wvp-28181-2.0
优化录像列表获取算法等
|
2021-01-11 21:34:16 +08:00 |
|
648540858
|
90476a6d36
|
Merge pull request #32 from lawrencehj/master
优化录像列表获取算法等
|
2021-01-11 21:33:39 +08:00 |
|
Lawrence
|
39912aa9a2
|
修正页码计算错误
|
2021-01-11 21:03:23 +08:00 |
|
Lawrence
|
809d650893
|
与master分支同步
|
2021-01-11 21:01:59 +08:00 |
|
Lawrence
|
45bc2f60f2
|
优化录像列表获取算法
|
2021-01-11 20:56:25 +08:00 |
|
Lawrence
|
a532bd2aa9
|
平台向上级联，重新启用时自动重设Expires值
|
2021-01-11 20:54:29 +08:00 |
|
Lawrence
|
bc3c51a773
|
设备注册时更新设备与通道信息
|
2021-01-11 20:52:58 +08:00 |
|
Lawrence
|
ac01a6acc4
|
修正播放回放ssrc
|
2021-01-11 20:51:58 +08:00 |
|
Lawrence
|
0a9d5a9bf5
|
格式调整
|
2021-01-11 20:44:24 +08:00 |
|
Lawrence
|
ee7333cd3e
|
修正录像回放streamId赋值
|
2021-01-11 20:42:40 +08:00 |
|
Lawrence
|
10970d0071
|
设备注册更新设备信息
|
2021-01-11 20:40:54 +08:00 |
|
Lawrence
|
d4ead3870d
|
优化录像清单获取算法
|
2021-01-11 20:39:27 +08:00 |
|
panlinlin
|
2746d8e447
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:51:44 +08:00 |
|
panlinlin
|
f84b6125c8
|
通过前端文件修复分页错误
|
2021-01-11 17:50:29 +08:00 |
|
panlinlin
|
1c8b072268
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:46:16 +08:00 |
|
648540858
|
34e73875b8
|
Merge pull request #31 from BradyXuBin/master
修复分页错误和增加配置忽略文件
|
2021-01-11 17:37:38 +08:00 |
|
panlinlin
|
19da2fb6ed
|
修复错误的使用stream作为ssrc导致的无法stop问题
|
2021-01-11 17:35:46 +08:00 |
|
BradyXuBin
|
8265496f60
|
1.修复分页错误，pageHelper是从1开始,目前是在后端的+1解决。
2.增加忽略自己本身配置文件。
|
2021-01-11 17:33:43 +08:00 |
|
648540858
|
42d837b70f
|
Merge pull request #29 from lawrencehj/wvp-28181-2.0
Wvp 28181 2.0
|
2021-01-11 11:24:56 +08:00 |
|
648540858
|
823c09eb6c
|
Merge pull request #30 from lawrencehj/master
与2.0同步修正部分错误
|
2021-01-11 11:24:34 +08:00 |
|
Lawrence
|
50c0cec22c
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:35:07 +08:00 |
|
Lawrence
|
32ea365979
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:27:04 +08:00 |
|
Lawrence
|
62342c6d37
|
与2.0同步修改
|
2021-01-11 09:18:00 +08:00 |
|
Lawrence
|
ef51d17dd2
|
报警响应处理去除catalog查询操作
|
2021-01-11 09:17:15 +08:00 |
|
Lawrence
|
b1f4810025
|
修正录像回放错误
|
2021-01-11 09:16:16 +08:00 |
|
Lawrence
|
6ce6b95b56
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:14:22 +08:00 |
|
Lawrence
|
b82b61038b
|
修正个别错误
|
2021-01-11 09:13:03 +08:00 |
|
Lawrence
|
f0f4537d80
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:11:56 +08:00 |
|
Lawrence
|
b146f40862
|
修改本地jar包路径描述，避免marven编译Warning
|
2021-01-11 09:10:56 +08:00 |
|
Lawrence
|
eec405028f
|
调整格式
|
2021-01-10 23:14:58 +08:00 |
|
Lawrence
|
11a04000b6
|
取消报警响应后查询目录操作
|
2021-01-10 23:12:30 +08:00 |
|
Lawrence
|
572b1aaba7
|
修正回放错误，优化sdp排序，提高设备兼容性
|
2021-01-10 23:11:30 +08:00 |
|
Lawrence
|
d32fc9e801
|
删除多余注释
|
2021-01-10 23:08:47 +08:00 |
|
Lawrence
|
d4eefffa51
|
Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
|
2021-01-10 21:38:40 +08:00 |
|
panlinlin
|
a796db6249
|
国标级联--选择通道003-前端页面
|
2021-01-10 20:14:11 +08:00 |
|
Lawrence
|
6002969517
|
修改本地jar库路径描述，避免marven编译Warning
|
2021-01-09 14:58:08 +08:00 |
|
panlinlin
|
8765ce134b
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-09 12:16:16 +08:00 |
|
panlinlin
|
440e070188
|
去除无用的配置项
|
2021-01-09 12:12:50 +08:00 |
|
panlinlin
|
15c1edc055
|
完成向上级联->选择通道-002
|
2021-01-08 17:35:05 +08:00 |
|
panlinlin
|
37b6afb9b2
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
|
2021-01-08 17:31:49 +08:00 |
|