 wangyimeng
|
04f938ef62
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
|
3 gadi atpakaļ |
|
wangyimeng
|
3469694ed1
1
|
3 gadi atpakaļ |
|
wangyimeng
|
c8831bc58f
更新同步wvp
|
3 gadi atpakaļ |
 648540858
|
c286ecb455
使用阿里代码规范。规范代码写法
|
3 gadi atpakaļ |
|
648540858
|
7f0ca85850
规范代码写法
|
3 gadi atpakaļ |
|
648540858
|
ff3c30f32e
优化收到心跳设置设备上线的逻辑
|
3 gadi atpakaļ |
 648540858
|
db865cc9cc
#453
|
3 gadi atpakaļ |
|
648540858
|
c4a2854e1b
修复添加/修改节点页面的BUG
|
3 gadi atpakaļ |
|
648540858
|
d679a9fcf8
添加对点播时设备自定义ssrc的支持
|
3 gadi atpakaļ |
|
648540858
|
f6fa1eed6c
Merge pull request #462 from hotcoffie/wvp-28181-2.0
|
3 gadi atpakaļ |
 xiaoxie
|
e0d641064a
多屏界面，切换分屏数时播放器正确调整尺寸
|
3 gadi atpakaļ |
|
648540858
|
2e90c7e7fe
Merge pull request #461 from hotcoffie/wvp-28181-2.0
|
3 gadi atpakaļ |
|
648540858
|
a53fe7761f
Merge pull request #457 from J1031/bugfix/transaction_is_null
|
3 gadi atpakaļ |
|
xiaoxie
|
35b3d7618d
修复多屏播放时播放器样式错位
|
3 gadi atpakaļ |
|
648540858
|
420a87cfd7
优化对Parental字段的判断
|
3 gadi atpakaļ |
|
648540858
|
4e0a463f88
优化对Parental字段的判断
|
3 gadi atpakaļ |
 quangz
|
effe71640d
修复ServerTransaction空指针异常
|
3 gadi atpakaļ |
|
648540858
|
102aad1f5d
判空
|
3 gadi atpakaļ |
|
648540858
|
363606d845
优化级联目录发送
|
3 gadi atpakaļ |
|
648540858
|
9ce22eba3c
行政区划作为级联数据的处理,修复设备树的显示
|
3 gadi atpakaļ |
|
648540858
|
6c719556f5
Merge pull request #451 from itouxin/patch-1
|
3 gadi atpakaļ |
|
648540858
|
62f5b3dfdd
Merge pull request #452 from hotcoffie/wvp-28181-2.0
|
3 gadi atpakaļ |
|
xiaoxie
|
5c1a5f7931
优化播放器尺寸调节逻辑：
|
3 gadi atpakaļ |
 TouXin
|
1484c14130
Update DOCKERFILE
|
3 gadi atpakaļ |
|
648540858
|
0b6b72ae44
多级虚拟组织处理修复
|
3 gadi atpakaļ |
|
648540858
|
a012007f36
多级虚拟组织处理修复
|
3 gadi atpakaļ |
|
648540858
|
26c3ca6a21
对于虚拟目录中出现多级虚拟组织的情况进行处理
|
3 gadi atpakaļ |
|
648540858
|
d4b05c11c0
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
3 gadi atpakaļ |
|
648540858
|
5dc08a45f8
增加redis通知方式向设备/平台发送报警消息功能
|
3 gadi atpakaļ |
|
648540858
|
9fb7246fec
Merge pull request #449 from hotcoffie/wvp-28181-2.0
|
3 gadi atpakaļ |
