panlinlin
|
6e4a8cac04
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2021-01-12 09:36:55 +08:00 |
|
Lawrence
|
5a3a346c59
|
解决非默认端口无法Send Bye的问题
|
2021-01-11 23:40:43 +08:00 |
|
Lawrence
|
a8108748fe
|
解决非默认端口无法Send Bye的问题
|
2021-01-11 23:29:18 +08:00 |
|
648540858
|
d8635682bb
|
Merge pull request #33 from lawrencehj/wvp-28181-2.0
优化录像列表获取算法等
|
2021-01-11 21:34:16 +08:00 |
|
648540858
|
2d8054be18
|
Merge pull request #32 from lawrencehj/master
优化录像列表获取算法等
|
2021-01-11 21:33:39 +08:00 |
|
Lawrence
|
80b5dc0068
|
修正页码计算错误
|
2021-01-11 21:03:23 +08:00 |
|
Lawrence
|
d568a18e0a
|
与master分支同步
|
2021-01-11 21:01:59 +08:00 |
|
Lawrence
|
dc1d9646a9
|
优化录像列表获取算法
|
2021-01-11 20:56:25 +08:00 |
|
Lawrence
|
df321f27af
|
平台向上级联，重新启用时自动重设Expires值
|
2021-01-11 20:54:29 +08:00 |
|
Lawrence
|
6735b01775
|
设备注册时更新设备与通道信息
|
2021-01-11 20:52:58 +08:00 |
|
Lawrence
|
ae4d330131
|
修正播放回放ssrc
|
2021-01-11 20:51:58 +08:00 |
|
Lawrence
|
5de358d38e
|
格式调整
|
2021-01-11 20:44:24 +08:00 |
|
Lawrence
|
6faf7fc994
|
修正录像回放streamId赋值
|
2021-01-11 20:42:40 +08:00 |
|
Lawrence
|
8b66abfbfc
|
设备注册更新设备信息
|
2021-01-11 20:40:54 +08:00 |
|
Lawrence
|
b8e67deb13
|
优化录像清单获取算法
|
2021-01-11 20:39:27 +08:00 |
|
panlinlin
|
8b4d8a76ac
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:51:44 +08:00 |
|
panlinlin
|
021b820736
|
通过前端文件修复分页错误
|
2021-01-11 17:50:29 +08:00 |
|
panlinlin
|
d94135c9cd
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-11 17:46:16 +08:00 |
|
648540858
|
e3943cb07e
|
Merge pull request #31 from BradyXuBin/master
修复分页错误和增加配置忽略文件
|
2021-01-11 17:37:38 +08:00 |
|
panlinlin
|
74c9e0400d
|
修复错误的使用stream作为ssrc导致的无法stop问题
|
2021-01-11 17:35:46 +08:00 |
|
BradyXuBin
|
255d2d4581
|
1.修复分页错误，pageHelper是从1开始,目前是在后端的+1解决。
2.增加忽略自己本身配置文件。
|
2021-01-11 17:33:43 +08:00 |
|
648540858
|
872d336ded
|
Merge pull request #29 from lawrencehj/wvp-28181-2.0
Wvp 28181 2.0
|
2021-01-11 11:24:56 +08:00 |
|
648540858
|
4005962c5b
|
Merge pull request #30 from lawrencehj/master
与2.0同步修正部分错误
|
2021-01-11 11:24:34 +08:00 |
|
Lawrence
|
e0eb295a79
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:35:07 +08:00 |
|
Lawrence
|
6f2cd3ec08
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:27:04 +08:00 |
|
Lawrence
|
8801c7741b
|
与2.0同步修改
|
2021-01-11 09:18:00 +08:00 |
|
Lawrence
|
e739c379ae
|
报警响应处理去除catalog查询操作
|
2021-01-11 09:17:15 +08:00 |
|
Lawrence
|
fb69312642
|
修正录像回放错误
|
2021-01-11 09:16:16 +08:00 |
|
Lawrence
|
42450af885
|
修改通道在线/离线描述，避免歧义
|
2021-01-11 09:14:22 +08:00 |
|
Lawrence
|
a47a7ccb54
|
修正个别错误
|
2021-01-11 09:13:03 +08:00 |
|
Lawrence
|
b0b924ee71
|
离线设备禁用通道查看，避免后续无效操作
|
2021-01-11 09:11:56 +08:00 |
|
Lawrence
|
80f6ecc617
|
修改本地jar包路径描述，避免marven编译Warning
|
2021-01-11 09:10:56 +08:00 |
|
Lawrence
|
68cad9a953
|
调整格式
|
2021-01-10 23:14:58 +08:00 |
|
Lawrence
|
e8960c6f2f
|
取消报警响应后查询目录操作
|
2021-01-10 23:12:30 +08:00 |
|
Lawrence
|
d5026897c1
|
修正回放错误，优化sdp排序，提高设备兼容性
|
2021-01-10 23:11:30 +08:00 |
|
Lawrence
|
37b1978da5
|
删除多余注释
|
2021-01-10 23:08:47 +08:00 |
|
Lawrence
|
625842fd0d
|
Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
|
2021-01-10 21:38:40 +08:00 |
|
panlinlin
|
658bec3ecc
|
国标级联--选择通道003-前端页面
|
2021-01-10 20:14:11 +08:00 |
|
Lawrence
|
fc4cd01f67
|
修改本地jar库路径描述，避免marven编译Warning
|
2021-01-09 14:58:08 +08:00 |
|
panlinlin
|
7ed4a26be6
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-09 12:16:16 +08:00 |
|
panlinlin
|
0dc017704a
|
去除无用的配置项
|
2021-01-09 12:12:50 +08:00 |
|
panlinlin
|
3131310642
|
完成向上级联->选择通道-002
|
2021-01-08 17:35:05 +08:00 |
|
panlinlin
|
7e581e9d3a
|
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 |
|
panlinlin
|
1342aad032
|
修复检测字段是否存在带来的停止按钮无法点击
修改错别字
|
2021-01-08 17:27:13 +08:00 |
|
panlinlin
|
675ce2346d
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-08 15:40:46 +08:00 |
|
panlinlin
|
224e904306
|
修复更新设备和通道信息时检测字段是否存在
|
2021-01-08 14:46:55 +08:00 |
|
panlinlin
|
d3578a957d
|
添加对水星云台控制的支持
|
2021-01-08 13:33:19 +08:00 |
|
panlinlin
|
422ce8aebb
|
完成向上级联->选择通道-001
|
2021-01-08 11:04:29 +08:00 |
|
panlinlin
|
0020402685
|
完成向上级联->选择通道-001
|
2021-01-08 11:02:53 +08:00 |
|
panlinlin
|
397e0c4a27
|
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
|
2021-01-07 16:52:18 +08:00 |
|