Commit Graph

1088 Commits

Author SHA1 Message Date
mk1990
850f20143f
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-16 09:38:06 +08:00
648540858
9a80e10f6e 使用 java.time.Instant代替 java.util.Date 2022-05-13 22:15:31 +08:00
648540858
95642d0bb8 优化录像结束发送BYE判断 2022-05-13 21:10:02 +08:00
648540858
98e6cf5bae 优化海康录像下载 2022-05-13 21:05:33 +08:00
648540858
d571e44040 去除过时注释 2022-05-13 15:45:02 +08:00
648540858
4d3f0a8d79 优化海康国标录像播放的控制 2022-05-13 15:41:50 +08:00
648540858
1757203202 支持海康摄像头国标录像查看播放 2022-05-13 15:32:30 +08:00
mk1990
95b1cbba65
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-13 10:58:33 +08:00
648540858
ec749de7c1 #470 2022-05-12 18:17:15 +08:00
648540858
4199650c20 #471 2022-05-12 18:15:35 +08:00
648540858
0781d9bc28 修复缺失的设备时间 2022-05-12 17:48:52 +08:00
mk1990
2d7a202096
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-12 16:16:55 +08:00
648540858
a030d00c88 修复代码 2022-05-12 10:48:50 +08:00
648540858
3cd1378d39 修复新设备注册 2022-05-12 10:24:08 +08:00
648540858
715ecb1d64 修复设备缺失的数据 2022-05-11 20:22:15 +08:00
648540858
f6893cf95b 优化设备在线状态 2022-05-11 18:37:24 +08:00
mk1990
6bab3b6740
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-10 18:02:09 +08:00
648540858
c395cf42d1 修复发流接口的调用 2022-05-10 11:01:33 +08:00
648540858
a1321c29c5 优化级联点播流程 2022-05-10 10:58:26 +08:00
648540858
93e6347f18 优化推流调用 2022-05-10 09:45:09 +08:00
648540858
bd21d0e391 优化目录获取并法能力 2022-05-10 09:38:05 +08:00
648540858
36170df3f4 修复打包优化pom 2022-05-07 15:13:56 +08:00
648540858
a8097c35da 更新readme 2022-05-07 14:44:00 +08:00
mk1990
88db57697a
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-07 11:25:13 +08:00
648540858
523139143f
Merge pull request #468 from TristingChen/resetQuery--add
开发----增加预置位查询接口开发
2022-05-07 09:00:22 +08:00
mk1990
a2182b5a7b
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-06 17:46:01 +08:00
chenjialing
cc63a52884 开发----增加预置位查询接口开发 2022-05-06 17:44:56 +08:00
648540858
e218553685 去除多与引用 2022-05-06 17:29:24 +08:00
648540858
afe2450a14 优化地图功能的开关 2022-05-06 16:01:36 +08:00
648540858
ee62f17170 统一userAgent 2022-05-06 15:55:32 +08:00
648540858
5d901b5e3f 使用阿里代码规范。规范代码写法 2022-05-06 10:12:34 +08:00
648540858
c286ecb455 使用阿里代码规范。规范代码写法 2022-05-05 17:07:16 +08:00
648540858
7f0ca85850 规范代码写法 2022-05-05 14:36:27 +08:00
648540858
ff3c30f32e 优化收到心跳设置设备上线的逻辑 2022-05-05 14:26:42 +08:00
mk1990
05a324a07a
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-05-05 08:43:10 +08:00
648540858
db865cc9cc #453 2022-04-28 18:18:09 +08:00
648540858
c4a2854e1b 修复添加/修改节点页面的BUG 2022-04-28 17:58:47 +08:00
648540858
d679a9fcf8 添加对点播时设备自定义ssrc的支持 2022-04-28 17:28:51 +08:00
mk1990
a0537d74df
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2022-04-28 16:32:09 +08:00
648540858
f6fa1eed6c
Merge pull request #462 from hotcoffie/wvp-28181-2.0
多屏界面,切换分屏数时播放器正确调整尺寸
2022-04-28 14:43:07 +08:00
xiaoxie
e0d641064a 多屏界面,切换分屏数时播放器正确调整尺寸 2022-04-28 14:23:17 +08:00
648540858
2e90c7e7fe
Merge pull request #461 from hotcoffie/wvp-28181-2.0
修复多屏播放时播放器样式错位
2022-04-28 14:03:37 +08:00
648540858
a53fe7761f
Merge pull request #457 from J1031/bugfix/transaction_is_null
修复ServerTransaction空指针异常
2022-04-28 14:02:18 +08:00
xiaoxie
35b3d7618d 修复多屏播放时播放器样式错位 2022-04-28 13:40:26 +08:00
648540858
420a87cfd7 优化对Parental字段的判断 2022-04-28 10:05:56 +08:00
648540858
4e0a463f88 优化对Parental字段的判断 2022-04-28 09:47:46 +08:00
quangz
effe71640d 修复ServerTransaction空指针异常 2022-04-27 18:51:47 +08:00
648540858
102aad1f5d 判空 2022-04-26 18:46:18 +08:00
648540858
363606d845 优化级联目录发送 2022-04-26 18:29:47 +08:00
648540858
9ce22eba3c 行政区划作为级联数据的处理,修复设备树的显示 2022-04-26 17:24:41 +08:00