guzijian / wvp-GB28181-pro · Commits

11 Jan, 2021

17 commits

Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
8b4d8a76

panlinlin authored
2021-01-11 17:51:44 +0800
Browse Code »
通过前端文件修复分页错误
021b8207

panlinlin authored
2021-01-11 17:50:29 +0800
Browse Code »
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
d94135c9

panlinlin authored
2021-01-11 17:46:16 +0800
Browse Code »
Merge pull request #31 from BradyXuBin/master ...
e3943cb0
```
修复分页错误和增加配置忽略文件
```
648540858 authored
2021-01-11 17:37:38 +0800
Browse Code »
修复错误的使用stream作为ssrc导致的无法stop问题
74c9e040

panlinlin authored
2021-01-11 17:35:46 +0800
Browse Code »
1.修复分页错误，pageHelper是从1开始,目前是在后端的+1解决。 ...
255d2d45
```
2.增加忽略自己本身配置文件。
```
BradyXuBin authored
2021-01-11 17:33:43 +0800
Browse Code »
Merge pull request #29 from lawrencehj/wvp-28181-2.0 ...
872d336d
```
Wvp 28181 2.0
```
648540858 authored
2021-01-11 11:24:56 +0800
Browse Code »
Merge pull request #30 from lawrencehj/master ...
4005962c
```
与2.0同步修正部分错误
```
648540858 authored
2021-01-11 11:24:34 +0800
Browse Code »
离线设备禁用通道查看，避免后续无效操作
e0eb295a

Lawrence authored
2021-01-11 09:35:07 +0800
Browse Code »
修改通道在线/离线描述，避免歧义
6f2cd3ec

Lawrence authored
2021-01-11 09:27:04 +0800
Browse Code »
与2.0同步修改
8801c774

Lawrence authored
2021-01-11 09:18:00 +0800
Browse Code »
报警响应处理去除catalog查询操作
e739c379

Lawrence authored
2021-01-11 09:17:15 +0800
Browse Code »
修正录像回放错误
fb693126

Lawrence authored
2021-01-11 09:16:16 +0800
Browse Code »
修改通道在线/离线描述，避免歧义
42450af8

Lawrence authored
2021-01-11 09:14:22 +0800
Browse Code »
修正个别错误
a47a7ccb

Lawrence authored
2021-01-11 09:13:03 +0800
Browse Code »
离线设备禁用通道查看，避免后续无效操作
b0b924ee

Lawrence authored
2021-01-11 09:11:56 +0800
Browse Code »
修改本地jar包路径描述，避免marven编译Warning
80f6ecc6

Lawrence authored
2021-01-11 09:10:56 +0800
Browse Code »

10 Jan, 2021

6 commits

调整格式
68cad9a9

Lawrence authored
2021-01-10 23:14:58 +0800
Browse Code »
取消报警响应后查询目录操作
e8960c6f

Lawrence authored
2021-01-10 23:12:30 +0800
Browse Code »
修正回放错误，优化sdp排序，提高设备兼容性
d5026897

Lawrence authored
2021-01-10 23:11:30 +0800
Browse Code »
删除多余注释
37b1978d

Lawrence authored
2021-01-10 23:08:47 +0800
Browse Code »
Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0
625842fd

Lawrence authored
2021-01-10 21:38:40 +0800
Browse Code »
国标级联--选择通道003-前端页面
658bec3e

panlinlin authored
2021-01-10 20:14:11 +0800
Browse Code »

09 Jan, 2021

3 commits

修改本地jar库路径描述，避免marven编译Warning
fc4cd01f

Lawrence authored
2021-01-09 14:58:08 +0800
Browse Code »
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
7ed4a26b

panlinlin authored
2021-01-09 12:16:16 +0800
Browse Code »
去除无用的配置项
0dc01770

panlinlin authored
2021-01-09 12:12:50 +0800
Browse Code »

08 Jan, 2021

8 commits

完成向上级联->选择通道-002
31313106

panlinlin authored
2021-01-08 17:35:05 +0800
Browse Code »
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 ...
7e581e9d
```
# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
```
panlinlin authored
2021-01-08 17:31:49 +0800
Browse Code »
修复检测字段是否存在带来的停止按钮无法点击 ...
1342aad0
```
修改错别字
```
panlinlin authored
2021-01-08 17:27:13 +0800
Browse Code »
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
675ce234

panlinlin authored
2021-01-08 15:40:46 +0800
Browse Code »
修复更新设备和通道信息时检测字段是否存在
224e9043

panlinlin authored
2021-01-08 14:46:55 +0800
Browse Code »
添加对水星云台控制的支持
d3578a95

panlinlin authored
2021-01-08 13:33:19 +0800
Browse Code »
完成向上级联->选择通道-001
422ce8ae

panlinlin authored
2021-01-08 11:04:29 +0800
Browse Code »
完成向上级联->选择通道-001
00204026

panlinlin authored
2021-01-08 11:02:53 +0800
Browse Code »

07 Jan, 2021

6 commits

Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
397e0c4a

panlinlin authored
2021-01-07 16:52:18 +0800
Browse Code »
增加云台控制的速度控制
568141b2

panlinlin authored
2021-01-07 16:44:42 +0800
Browse Code »
Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
059a5a67

panlinlin authored
2021-01-07 15:31:16 +0800
Browse Code »
修复重启zlm导致的点播失败
05960d35

panlinlin authored
2021-01-07 15:29:58 +0800
Browse Code »
完成向上级联->启动时自动注册
9bf87971

panlinlin authored
2021-01-07 14:56:10 +0800
Browse Code »
完成向上级联->保存时注册或注销
53ffefe0

panlinlin authored
2021-01-07 14:09:41 +0800
Browse Code »