648540858
|
0cde02c397
|
[集群] 修复语音对讲支持
|
2025-01-21 17:45:48 +08:00 |
|
648540858
|
ba27819874
|
[集群] 增加语音对讲支持
|
2025-01-21 17:35:21 +08:00 |
|
648540858
|
135f3054e6
|
[集群] 修复获取国标设备未赋值serverId的BUG
|
2025-01-21 17:08:21 +08:00 |
|
648540858
|
4e66e2bc6d
|
[集群] 增加通道刷新状态消息
|
2025-01-21 17:04:51 +08:00 |
|
648540858
|
01f491c026
|
[集群] 修复同步通道时的通道上下线消息发送
|
2025-01-21 17:00:37 +08:00 |
|
648540858
|
3bae4ce63e
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
|
2025-01-17 10:53:08 +08:00 |
|
648540858
|
464c989986
|
国标收流时流传输模式默认使用TCP被动
|
2025-01-12 22:24:47 +08:00 |
|
648540858
|
5480e68b86
|
Merge pull request #1747 from QianNangong/master
修复上级点播国标级联的拉流代理相机，当流上线很慢时，收到来自上级的 ACK 早于流注册导致推流失败的问题
|
2025-01-11 20:32:40 +08:00 |
|
648540858
|
8ff68b2291
|
Merge branch 'master' into dev/数据库统合
|
2025-01-06 09:35:04 +08:00 |
|
648540858
|
812760efc3
|
增加日志
|
2025-01-06 09:34:32 +08:00 |
|
Li Keqing
|
469717523b
|
修复当拉流代理上线很慢时，收到来自上级的 ACK 早于流注册导致推流失败的问题
|
2025-01-03 19:32:49 +08:00 |
|
648540858
|
63fbafe687
|
[集群] 支持通道刷新
|
2025-01-03 17:52:38 +08:00 |
|
648540858
|
a2e7cd0323
|
[集群] 修复catalog 递归循环BUG
|
2025-01-03 17:34:30 +08:00 |
|
648540858
|
85427497bf
|
Merge branch 'master' into dev/数据库统合
|
2025-01-03 17:27:25 +08:00 |
|
648540858
|
5cf5c506b1
|
优化SIP消息回复判定条件，修复目录推送BUG #1725
|
2025-01-03 17:21:09 +08:00 |
|
648540858
|
a9a4c7a4e5
|
[集群] 修复BUG
|
2025-01-03 16:34:11 +08:00 |
|
648540858
|
42322c75cc
|
[集群] 优化国标级联目录更新
|
2025-01-03 16:21:20 +08:00 |
|
648540858
|
232fa760e2
|
[集群] 支持国标级联目录更新
|
2025-01-03 15:34:53 +08:00 |
|
648540858
|
3903bc31b5
|
Merge branch 'master' into dev/数据库统合
|
2025-01-03 15:10:23 +08:00 |
|
648540858
|
cb7c41c3c1
|
[国标级联] 优化catalog推送代码
|
2025-01-03 15:10:02 +08:00 |
|
648540858
|
b0b3f32e03
|
[集群] 支持国标级联更新
|
2025-01-02 18:34:22 +08:00 |
|
648540858
|
7fb07848ab
|
[集群-自动切换过国标级联] 修复BUG
|
2025-01-02 17:33:10 +08:00 |
|
648540858
|
347b2a6a4c
|
[集群-自动切换过国标级联] 修复BUG
|
2025-01-02 17:32:27 +08:00 |
|
648540858
|
0566bf916f
|
[集群-自动切换过国标级联] 修复BUG
|
2025-01-02 17:26:50 +08:00 |
|
648540858
|
ea2ef923ac
|
增加日志
|
2025-01-02 17:20:16 +08:00 |
|
648540858
|
5cd509b644
|
修改平台名称
|
2025-01-02 17:19:03 +08:00 |
|
648540858
|
5db9033372
|
[集群-自动切换过国标级联] 修复BUG
|
2025-01-02 17:07:38 +08:00 |
|
648540858
|
157d0a1e71
|
修复平台查询sql错误
|
2025-01-02 16:35:45 +08:00 |
|
648540858
|
91b0ba4d5e
|
[集群-自动切换过国标级联] 启动时自动注册上级只注册本平台的上级
|
2025-01-02 16:30:02 +08:00 |
|
648540858
|
d022eb72d6
|
[集群-自动切换过国标级联] 添加检测wvp奔溃与重新注册
|
2025-01-02 16:16:50 +08:00 |
|
648540858
|
af04669d49
|
Merge branch 'master' into dev/数据库统合
|
2025-01-02 14:46:16 +08:00 |
|
648540858
|
b37c0e264c
|
修复 #1743
|
2025-01-02 14:45:45 +08:00 |
|
648540858
|
884fcb827f
|
[集群-自动切换过国标级联] 添加数据库脚本
|
2025-01-02 14:29:13 +08:00 |
|
claire
|
d7ebe93337
|
增加光圈速度范围判断
|
2025-01-02 14:20:04 +08:00 |
|
claire
|
daeb48f62a
|
修复设备云台控制关于速度的错误描述，水平垂直控制速度为00H~FFH(0-255),变倍控制速度为0H~FH(0-15)，聚焦速度为00H~FFH(0-255),光圈速度为00H~FFH(0-255)
|
2025-01-02 14:16:44 +08:00 |
|
648540858
|
c2eecc43e7
|
Merge branch 'master' into dev/数据库统合
|
2024-12-31 16:16:33 +08:00 |
|
648540858
|
3367b70c61
|
增加日志
|
2024-12-31 16:15:43 +08:00 |
|
648540858
|
0cebbee0a9
|
[RPC] 增加订阅支持
|
2024-12-30 16:19:14 +08:00 |
|
648540858
|
317f771fa2
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceChannelService.java
# web_src/src/components/DeviceList.vue
|
2024-12-30 16:00:58 +08:00 |
|
648540858
|
0dd2826b9e
|
优化设备订阅的操作方式
|
2024-12-30 15:59:15 +08:00 |
|
648540858
|
45337311ec
|
[国标PTZ] 添加调用其他wvp的云台控制
|
2024-12-30 10:27:49 +08:00 |
|
648540858
|
115b41e001
|
[国标PTZ] 添加调用其他wvp的云台控制
|
2024-12-27 17:53:25 +08:00 |
|
648540858
|
45862480aa
|
Merge branch 'master' into dev/数据库统合
|
2024-12-27 17:38:07 +08:00 |
|
648540858
|
058909197e
|
[国标PTZ] 调整云台控制调用
|
2024-12-27 17:37:50 +08:00 |
|
648540858
|
7751eae913
|
Merge branch 'master' into dev/数据库统合
|
2024-12-27 15:31:27 +08:00 |
|
Li Keqing
|
dade2854b1
|
修复级联状态推成 0 和 1 而不是 ON 和 OFF 的问题
|
2024-12-27 15:18:56 +08:00 |
|
648540858
|
a5f1422466
|
[WVP集群] 合并主线
|
2024-12-27 11:18:29 +08:00 |
|
648540858
|
e05d988755
|
Merge branch 'master' into dev/数据库统合
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceMapper.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
# src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlatformChannelServiceImpl.java
|
2024-12-27 10:57:42 +08:00 |
|
648540858
|
ce73b6feb1
|
修复清理通道错误
|
2024-12-27 09:53:27 +08:00 |
|
648540858
|
081bb6de18
|
完善通道数据类型的保存与展示
|
2024-12-24 23:35:01 +08:00 |
|