648540858
|
c909fcf379
|
优化国标录像下载，添加进度条以及自动合并文件下载，需要结合新版assist服务使用。
|
2022-03-25 16:05:14 +08:00 |
|
648540858
|
348b9cbc65
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-25 10:01:12 +08:00 |
|
648540858
|
b14dc301d8
|
优化目录推送CivilCode值
|
2022-03-24 15:59:38 +08:00 |
|
648540858
|
b1901f102a
|
Merge pull request #379 from MeBetterMan/wvp-28181-2.0
级联场景，invite消息中获取channelid。以前从invite的第一行读取，现在从subject header读取。
|
2022-03-22 11:45:11 +08:00 |
|
648540858
|
6daa654f27
|
修身颠簸与录像回放redis前缀重复的问题
|
2022-03-21 16:58:42 +08:00 |
|
brewswang
|
589d26fe9e
|
执法记录仪在更新目录数据的时候需要更新位置信息
|
2022-03-17 12:39:59 +08:00 |
|
648540858
|
cb083223f8
|
统一国标设备与级联平台字符集的使用
|
2022-03-17 10:29:49 +08:00 |
|
648540858
|
dc328b9eeb
|
#393
|
2022-03-16 17:46:24 +08:00 |
|
648540858
|
fa122fd68b
|
修复合并pr带来的bug
|
2022-03-16 16:55:04 +08:00 |
|
648540858
|
e1f24ef254
|
Merge pull request #399 from nikmu/wvp-28181-2.0
修复device_channel的Id改变带来的tree查询bug
|
2022-03-16 16:42:50 +08:00 |
|
朱俊杰
|
3341e8315f
|
去掉createinfo中的cseq参数
|
2022-03-16 11:21:39 +08:00 |
|
朱俊杰
|
d7d2776269
|
修复info请求头中的cseq序列
|
2022-03-16 11:18:09 +08:00 |
|
648540858
|
36c720cc55
|
修复推流关联平台的bug
|
2022-03-15 16:58:50 +08:00 |
|
648540858
|
8ad6c7dbba
|
使用zlm原生的rtp随机端口配置
|
2022-03-15 15:37:22 +08:00 |
|
648540858
|
c9d2c69155
|
修复多平台同时导入时的bug
|
2022-03-15 11:44:11 +08:00 |
|
648540858
|
00b9831fe4
|
#394
|
2022-03-14 18:34:25 +08:00 |
|
648540858
|
f2af3bd989
|
优化点播, 级联点播级联录像。级联列表显示订阅状态
|
2022-03-14 18:24:30 +08:00 |
|
648540858
|
ddc0779b4f
|
移除多余字段
|
2022-03-11 11:22:47 +08:00 |
|
648540858
|
dd2deaaa3c
|
#376
|
2022-03-11 09:58:36 +08:00 |
|
648540858
|
3735943594
|
优化目录订阅时父节点的更新
|
2022-03-11 09:54:35 +08:00 |
|
648540858
|
63fec78d24
|
优化目录订阅以及国标级联目录订阅回复
|
2022-03-10 20:53:56 +08:00 |
|
Fang
|
339b51d233
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-03-07 14:21:29 +08:00 |
|
李防
|
b9710228dd
|
InviteRequestProcessor类中，channelid从invite消息的header subject获取，不再从第一行request line获取。原因是和第三方平台对接时，发送的invite消息第一行为国标平台编码而不是设备通道编码，导致报错通道不存在，返回404。
|
2022-03-07 14:20:27 +08:00 |
|
648540858
|
7044cf8c29
|
修复导入通道时无平台关联时的bug
|
2022-03-07 10:47:06 +08:00 |
|
648540858
|
13899f771b
|
优化ssrc释放逻辑，优化级联点播速度，去除等待流格式的配置项
|
2022-03-07 01:17:45 +08:00 |
|
648540858
|
a919611214
|
修复合并分支造成的bug
|
2022-03-04 15:59:29 +08:00 |
|
648540858
|
7af0cc437a
|
优化国标级联录像预览
|
2022-03-03 18:23:52 +08:00 |
|
648540858
|
42cbec85e8
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-03-03 16:55:20 +08:00 |
|
648540858
|
5c69ffce33
|
参数名错误
|
2022-03-03 16:54:47 +08:00 |
|
648540858
|
cc7f784198
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# 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/ByeRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-03-03 16:28:32 +08:00 |
|
648540858
|
1527b0e839
|
国标录像支持多端同时播放
|
2022-03-03 15:57:28 +08:00 |
|
panll
|
698ea11b16
|
!7 rPort 变更了HostAddres也要变
Merge pull request !7 from ckb_test/N/A
|
2022-03-02 06:23:31 +00:00 |
|
648540858
|
f61d0c35d7
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
|
2022-03-02 12:52:37 +08:00 |
|
648540858
|
78bad59518
|
优化国标级联的目录订阅
|
2022-03-02 11:48:20 +08:00 |
|
chenjialing
|
22fd9e6f8c
|
告警信息上报过程中，AlarmType存储失败的解决
|
2022-03-02 09:18:17 +08:00 |
|
648540858
|
6d8ea04fe0
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
# web_src/src/components/control.vue
|
2022-03-01 22:07:01 +08:00 |
|
648540858
|
4c53e56d90
|
解决对接中遇到的问题
|
2022-03-01 17:42:22 +08:00 |
|
ckb_test
|
3787640dd1
|
rPort 变更了HostAddres也要变
|
2022-02-28 09:07:02 +00:00 |
|
648540858
|
1bbf270fec
|
实现国标录像级联播放，优化点播流程，加快点播速度
|
2022-02-27 20:01:31 +08:00 |
|
648540858
|
1fa0046395
|
Merge branch 'wvp-28181-2.0' into wvp-pro-record
|
2022-02-25 20:33:38 +08:00 |
|
648540858
|
bd4f730d79
|
规范数据库，解决bug
|
2022-02-25 20:33:02 +08:00 |
|
648540858
|
8dfb2fc4a2
|
实现国标的级联录像查询
|
2022-02-24 21:10:34 +08:00 |
|
648540858
|
48fac476dc
|
同步主线
|
2022-02-23 21:55:46 +08:00 |
|
648540858
|
19ef156bda
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-pro-record
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
18b92a0d4f
|
Merge remote-tracking branch 'origin/master' into wvp-pro-record
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/session/VideoStreamSessionManager.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
|
2022-02-22 11:55:23 +08:00 |
|
648540858
|
b1ff3773a4
|
规范数据库，给各个标设置主键ID
|
2022-02-22 11:44:56 +08:00 |
|
648540858
|
479a07f879
|
兼容海康不规范的xml，大幅度提高通道分页查询速度，优化节点的保活。
|
2022-02-20 16:22:43 +08:00 |
|
648540858
|
a86d4180c2
|
优化级联通道发送速度
|
2022-02-20 16:18:14 +08:00 |
|
648540858
|
ceca493999
|
修复级联通道回复错误
|
2022-02-16 15:13:16 +08:00 |
|
648540858
|
74f4e2f89a
|
添加对可能空指针的判断
|
2022-01-28 16:30:10 +08:00 |
|