648540858
995978fb0a
更新播放器
2022-03-28 15:26:48 +08:00
mk1990
87f16e594b
Merge branch 'wvp-28181-2.0' of https://github.91chi.fun/https://github.com/648540858/wvp-GB28181-pro into wvp-28181-2.0
2022-03-28 14:36:13 +08:00
648540858
1855913d43
修复国标目录发送缺失的问题
2022-03-28 11:03:17 +08:00
mk1990
e6ceb87492
1. 修改control.vue 报Invalid prop: type check failed for prop "column". Expected Number with value 1, got String with value "1".
...
2. 修改control.vue Error: [vue-clipboards] Invalid value. Please use a valid value.
3. 修改DeviceList.vue 刷新时报
[Vue warn]: Avoid mutating a prop directly since the value will be overwritten whenever the parent component re-renders. Instead, use a data or computed property based on the prop's value. Prop being mutated: "loading"
2022-03-28 10:11:13 +08:00
648540858
d8b7e06c5c
兼容海康 媒体通知 消息from字段不是设备ID的问题
2022-03-25 18:05:05 +08:00
648540858
8b1283be1b
优化国标级联上级要求tcp推流时的回复
2022-03-25 17:22:17 +08:00
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
648540858
f59189aebd
Merge pull request #403 from brewswang/wvp-28181-2.0
...
执法记录仪在更新目录数据的时候需要更新位置信息
2022-03-17 14:56:15 +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
bee18d3a7e
#401
2022-03-16 16:46:18 +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
wangyimeng
65b9240c71
删除重复字段
2022-03-16 15:27:12 +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
ce2e412c69
修复推流关联平台的bug again
2022-03-16 10:12:31 +08:00
mrjackwang
217295d33a
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-03-16 08:54:31 +08:00
648540858
21367a09a6
修复推流关联平台的bug
2022-03-15 17:45:55 +08:00
648540858
36c720cc55
修复推流关联平台的bug
2022-03-15 16:58:50 +08:00
朱俊杰
aaa1c8d6cb
修复device_channel的Id改变带来的tree查询bug
2022-03-15 16:31:06 +08:00
648540858
e1cb286392
必须提前在zlm上配置port_range属性，不然自动配置此属性可能不成功
2022-03-15 15:40:15 +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
3cb0677fe0
#396
2022-03-15 10:47:07 +08:00
mrjackwang
29585e09bb
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
2022-03-15 10:28:23 +08:00
648540858
c570a88b0f
修复平台编辑的bug
2022-03-15 10:13:19 +08:00
648540858
319e149692
修复使用ffmpeg拉流代理时ffmpeg cmd模板空白的bug
2022-03-15 09:45: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
91eb4a09b8
使用zlm新特性支持对与国标流关闭音频以加快拉流速度
2022-03-14 11:36:01 +08:00
648540858
d1b0f3dcee
#390
2022-03-11 11:22:55 +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
613c771c45
Merge pull request #388 from AbnerSC/wvp-28181-2.0
...
修复关闭按需拉流无效的问题，和几个小问题
2022-03-11 09:49:48 +08:00
648540858
edc98da01b
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
2022-03-11 09:49:38 +08:00
mrjackwang
6a77a7ded7
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-03-10 21:00:42 +08:00
648540858
0932382a36
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
2022-03-10 20:54:14 +08:00
648540858
63fec78d24
优化目录订阅以及国标级联目录订阅回复
2022-03-10 20:53:56 +08:00
dengming
dd7695d7c6
Merge branch 'wvp-28181-2.0' of github.com:AbnerSC/wvp-GB28181-pro into wvp-28181-2.0
2022-03-10 17:52:59 +08:00
sc.dm
e8c244e907
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
2022-03-10 17:42:02 +08:00
dengming
c0139c4230
优化pom配置，解决编译Failed to perform fetch问题
2022-03-10 17:40:45 +08:00
dengming
54b2b1c867
删除重复字段，channelId字段查询了两次
2022-03-10 17:27:07 +08:00
dengming
0c9691ccf5
删除多余依赖包com.google.guava:30.0-jre，项目引用了版本31
2022-03-10 15:24:50 +08:00
