648540858
|
cfed860667
|
合并主线
|
2022-07-12 16:54:58 +08:00 |
|
648540858
|
66e6756909
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/service/IMediaService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
|
2022-07-12 16:28:51 +08:00 |
|
648540858
|
0b1cae75fe
|
动态人物管理增加自检机制。防止内存溢出
|
2022-07-12 10:32:45 +08:00 |
|
648540858
|
74d97734ba
|
修复获取推流播放地址接口
|
2022-07-11 17:34:22 +08:00 |
|
648540858
|
1a1a68784b
|
去除失效的配置，增加人物结束时移除人物缓存
|
2022-07-11 16:41:32 +08:00 |
|
648540858
|
afbec28906
|
增加推流鉴权。保护服务安全
|
2022-07-11 16:21:01 +08:00 |
|
648540858
|
44b06e1b6e
|
修复默认用户信息插入
|
2022-07-11 15:26:25 +08:00 |
|
648540858
|
fcd79b9864
|
用户表增加推流鉴权KEY
|
2022-07-08 11:20:29 +08:00 |
|
648540858
|
d7c293c867
|
界面优化
|
2022-07-06 10:18:56 +08:00 |
|
648540858
|
8aa0bdf539
|
数据库优化
|
2022-07-06 09:44:37 +08:00 |
|
648540858
|
10cb58391a
|
修复轨迹的储存与查询展示
|
2022-07-04 01:08:26 +08:00 |
|
648540858
|
5364db2982
|
优化对讲逻辑
|
2022-07-03 22:27:04 +08:00 |
|
648540858
|
7609d7836c
|
优化对讲逻辑
|
2022-07-03 16:23:31 +08:00 |
|
648540858
|
e78c402a24
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/mysql.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-07-03 10:32:33 +08:00 |
|
648540858
|
5d673fb033
|
修复通道数据写入数据库
|
2022-07-03 08:47:47 +08:00 |
|
648540858
|
f5fcc79a2c
|
优化国标树型展示
|
2022-07-03 07:40:54 +08:00 |
|
648540858
|
72c1b36d6d
|
优化对讲逻辑
|
2022-07-03 00:44:36 +08:00 |
|
648540858
|
b6c97528ae
|
添加界面停止逻辑
|
2022-07-01 18:36:35 +08:00 |
|
648540858
|
07956b48df
|
添加界面优化接口
|
2022-07-01 18:26:35 +08:00 |
|
648540858
|
1d1f174852
|
合并主线
|
2022-06-27 14:40:07 +08:00 |
|
648540858
|
26739237e2
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
# Conflicts:
# sql/update.sql
# src/main/java/com/genersoft/iot/vmp/gb28181/bean/Device.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/IPlayService.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
# web_src/src/components/dialog/deviceEdit.vue
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 10:16:21 +08:00 |
|
648540858
|
038d360dd4
|
Merge remote-tracking branch 'origin/rtc' into commercial
# Conflicts:
# web_src/src/components/dialog/devicePlayer.vue
|
2022-06-27 09:38:59 +08:00 |
|
648540858
|
0da452293f
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-23 10:14:56 +08:00 |
|
648540858
|
59e0767179
|
Merge pull request #530 from mk1990/wvp-28181-2.0
fix设备状态查询接口
|
2022-06-22 17:43:59 +08:00 |
mk1990
|
23bd11869b
|
添加国标级联录像控制功能
|
2022-06-22 16:47:26 +08:00 |
|
mk1990
|
c239ee277c
|
添加国标级联录像控制功能
|
2022-06-22 16:39:07 +08:00 |
|
mk1990
|
5e5437b630
|
添加国标级联录像控制功能
|
2022-06-22 16:31:58 +08:00 |
|
mk1990
|
4b4afa4ef7
|
添加国标级联录像控制功能
|
2022-06-22 16:26:41 +08:00 |
|
mk1990
|
6c919937bd
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
|
2022-06-22 14:42:46 +08:00 |
|
mk1990
|
519a08e530
|
添加国标级联录像控制功能
|
2022-06-22 14:39:57 +08:00 |
|
mk1990
|
2a792fffb4
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 14:27:33 +08:00 |
|
mk1990
|
9bb61a70ab
|
添加国标级联录像控制功能
|
2022-06-22 14:26:46 +08:00 |
mk1990
|
1e105fb6e1
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-06-22 13:38:25 +08:00 |
|
mk1990
|
0c4a8c0975
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/info/InfoRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
|
2022-06-22 13:34:56 +08:00 |
|
mk1990
|
0e18a163ac
|
添加国标级联录像控制功能
|
2022-06-22 13:33:55 +08:00 |
|
mk1990
|
4d2c36edcd
|
fix设备状态查询接口
|
2022-06-22 13:09:09 +08:00 |
|
648540858
|
74365144aa
|
Merge pull request #527 from BradyXs/wvp-28181-2.0
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
|
2022-06-22 10:02:53 +08:00 |
|
mk1990
|
8eff2f1d11
|
添加国标级联录像控制功能；
|
2022-06-22 09:08:28 +08:00 |
|
mk1990
|
3d6db7478d
|
fix设备状态查询接口
|
2022-06-20 15:10:31 +08:00 |
bradyxu
|
072e84db19
|
fix(SIP): 修复海康NVR无parentId导致分屏监控没办法展开的问题
由于海康NVR通道信息中不带NVR的ID作为parentId。导致通道信息parentId缺失,
在通道信息中判断device信息中的DeviceId如果为NVR的话，将NVR的deviceId设置为通道的parentId
|
2022-06-18 10:40:24 +08:00 |
|
648540858
|
ddfe4a7b2d
|
Merge pull request #524 from TristingChen/fixed--processTimeout
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:05:35 +08:00 |
chenjialing
|
39a5c8e2cf
|
fixed--解决ssrc默认开启失败的问题，解决信令超时设备下线的bug
|
2022-06-17 16:01:18 +08:00 |
|
648540858
|
c2faa8c3ce
|
显示效果优化
|
2022-06-15 16:04:36 +08:00 |
|
648540858
|
dbe6ece653
|
优化播放中zlm离线判断
|
2022-06-15 15:06:22 +08:00 |
|
648540858
|
f7006e4881
|
修复播放中zlm离线导致的bye发送失败
|
2022-06-15 14:55:33 +08:00 |
|
648540858
|
f760134b39
|
Merge pull request #517 from TristingChen/optimize-play-controller
Optimize play controller
|
2022-06-15 14:19:33 +08:00 |
|
chenjialing
|
0e826e3448
|
优化--端口获取失败之时（如zlm连接失败），不进行invite点播消息的发送
|
2022-06-15 14:14:29 +08:00 |
|
chenjialing
|
8f7db635a3
|
优化----okhttp连接访问超时设置，访问异常code设置为-2
|
2022-06-15 14:13:43 +08:00 |
|
648540858
|
a9c4638c94
|
修复通道列表修改分页大小无效
|
2022-06-15 11:02:19 +08:00 |
|
648540858
|
5fae9a7b34
|
优化列表展示效果
|
2022-06-15 10:40:45 +08:00 |