mk1990
|
2d7a202096
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-12 16:16:55 +08:00 |
648540858
|
9fa739ac02
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-12 10:54:46 +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
|
a9bdb0a706
|
优化语音广播流程
|
2022-05-10 17:45:07 +08:00 |
|
648540858
|
f8f65d473b
|
优化语音广播流程
|
2022-05-10 13:08:32 +08:00 |
|
648540858
|
65fa75fb44
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-10 11:02:02 +08:00 |
|
648540858
|
c395cf42d1
|
修复发流接口的调用
|
2022-05-10 11:01:33 +08:00 |
|
648540858
|
16cb8cd195
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
|
2022-05-10 11:00:51 +08:00 |
|
648540858
|
a1321c29c5
|
优化级联点播流程
|
2022-05-10 10:58:26 +08:00 |
|
648540858
|
4a0f5cf76d
|
去除调试内容
|
2022-05-10 10:11:46 +08:00 |
|
648540858
|
6e48dd3f32
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
|
2022-05-10 09:46:47 +08:00 |
|
648540858
|
93e6347f18
|
优化推流调用
|
2022-05-10 09:45:09 +08:00 |
|
648540858
|
bd21d0e391
|
优化目录获取并法能力
|
2022-05-10 09:38:05 +08:00 |
|
648540858
|
c2aaae9325
|
初步实现语音喊话
|
2022-05-09 18:15:30 +08:00 |
hotcoffie
|
ec8ab540f8
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-07 17:42:31 +08:00 |
|
648540858
|
9f0ef439cc
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-07 15:21:48 +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
|
ca16a79255
|
添加语音发送通道和语音接收通道字段
|
2022-05-07 09:52:02 +08:00 |
|
648540858
|
ee2dda21f0
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-07 09:03:20 +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
|
22d8d22238
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
|
2022-05-06 17:30:31 +08:00 |
|
648540858
|
e218553685
|
去除多与引用
|
2022-05-06 17:29:24 +08:00 |
|
648540858
|
e7f5cfc422
|
test
|
2022-05-06 17:26:36 +08:00 |
|
648540858
|
afe2450a14
|
优化地图功能的开关
|
2022-05-06 16:01:36 +08:00 |
|
648540858
|
ee62f17170
|
统一userAgent
|
2022-05-06 15:55:32 +08:00 |
wangyimeng
|
04f938ef62
|
Merge branch 'wvp-28181-2.0' of https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
# Conflicts:
# bootstrap.sh
# web_src/package-lock.json
# web_src/static/js/jessibuca/decoder.wasm
|
2022-05-06 12:19:44 +08:00 |
|
wangyimeng
|
3469694ed1
|
1
|
2022-05-06 12:05:12 +08:00 |
|
wangyimeng
|
c8831bc58f
|
更新同步wvp
|
2022-05-06 11:56:29 +08:00 |
|
hotcoffie
|
bfaa519e49
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-05-06 10:59:33 +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 |
xiaoxie
|
c592740efa
|
升级shelljs，解决较高版本node打包时的警告
|
2022-05-01 21:33:56 +08:00 |
|
xiaoxie
|
260bfd5935
|
替换一个过时的API，解决maven打包警告
|
2022-05-01 21:32:43 +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 |