Commit Graph

1978 Commits

Author SHA1 Message Date
648540858
7a52db4e89
Merge pull request #1138 from shuxiaoyuan/fix-subscribe-catalog
bugfix:设备地址变化会引起目录订阅任务失效,需要重新添加
2023-12-11 10:11:36 +08:00
648540858
083523d204
Merge pull request #1188 from lunasaw/wvp-28181-2.0-fix
fix find stream
2023-12-11 10:06:35 +08:00
648540858
9f7dc295cf
Merge pull request #1140 from shuxiaoyuan/fix-update-time
bugfix:目录订阅收到更新事件时,sql字段update_time为空导致的报错
2023-12-11 10:05:57 +08:00
648540858
33506a0046
Merge pull request #1146 from leibnewton/fix_on_stream_changed
修复OnStreamChangedHook媒体轨道信息解析错误
2023-12-11 10:05:36 +08:00
648540858
bdd1846eb4 优化自动点播判断逻辑 2023-12-06 22:31:26 +08:00
chenzhangyue
0542700225 fix find stream 2023-12-01 10:34:16 +08:00
dongzhou.xie
9a572b97df 修复OnStreamChangedHook媒体轨道信息解析错误 2023-11-07 11:52:07 +08:00
648540858
a01295603a 简化配置 2023-11-03 17:32:37 +08:00
lishuyuan
8bd2f47c9a bugfix:目录订阅收到更新事件时,sql字段update_time为空导致的报错 2023-11-02 10:17:47 +08:00
lishuyuan
5cd2e2c41b bugfix:设备地址变化会引起目录订阅任务失效,需要重新添加 2023-11-01 15:17:28 +08:00
648540858
f4f3e60a6b
Merge pull request #1082 from DavidSche/Live_streaming_push
推流列表-->添加通道 补充播放需要的默认参数  媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示)
2023-10-27 15:47:27 +08:00
648540858
f9abbc7fe8
Merge pull request #1095 from AlphaWu/Zafu-Dev-20231001
修复数据库脚本的BUG。
2023-10-27 15:42:54 +08:00
648540858
af911d4f02
Merge pull request #1102 from xu-bin-bin/wvp-28181-2.0
修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题
2023-10-27 15:42:32 +08:00
648540858
47783946fe
Merge pull request #1105 from lunasaw/dev-wvp-1011
feat:支持代理拉流状态检测,离线查询流是否离线
2023-10-27 15:41:26 +08:00
648540858
8fd87b335d
Merge pull request #1132 from shuxiaoyuan/fix-notify-catalog
目录订阅bug修复
2023-10-27 15:40:07 +08:00
lishuyuan
da7889bf67 bugfix:编辑国标设备时,若目录订阅周期本来不为0时不生效 2023-10-27 11:15:30 +08:00
lishuyuan
26ca854db5 bugfix:去掉目录订阅通知处理重复逻辑代码 2023-10-27 11:09:42 +08:00
xu-bin-bin
ae9976bb3a
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-24 09:28:16 +08:00
648540858
2bb7e23601
Merge pull request #1119 from xiaoQQya/develop
fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题
2023-10-23 09:12:19 +08:00
xiaoQQya
613399cc6d fix(play): 修复单端口推流下级自定义 ssrc 时, 流注册后接口仍然超时的问题 2023-10-17 17:49:31 +08:00
xu-bin-bin
90d9cd8ac8
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-17 09:23:45 +08:00
648540858
12c4128e81 修复目录更新时已删除数据的整理功能 2023-10-13 15:44:49 +08:00
xu-bin-bin
124d83fc0c
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0 2023-10-13 08:55:27 +08:00
648540858
78f628dd6f 修复同步目录时批量提交的错误 2023-10-12 17:01:25 +08:00
648540858
7d6aaf3bb0 修复国标接连选择通道相关的问题 2023-10-12 16:36:07 +08:00
chenzhangyue
f5d89e06a3 feat:支持代理拉流状态检测,离线查询流是否离线 2023-10-11 13:52:08 +08:00
xubinbin
4084080a8e 修复在修改设备信息的移动位置订阅由非0值改为0值时不生效的问题。 2023-10-10 15:17:06 +08:00
648540858
205f1f1f60 优化国标级联心跳失败再次注册的逻辑 2023-10-08 15:41:24 +08:00
648540858
c084d6c98a 优化国标级联心跳失败判断逻辑 2023-10-07 18:00:08 +08:00
648540858
4c28f380aa 优化byte数组转换 2023-10-07 14:52:46 +08:00
AlphaWu
f6c1ce15e4 修复数据库脚本的BUG。 2023-10-01 12:29:48 +08:00
648540858
94a0de0d27 Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 2023-09-30 06:09:57 +08:00
648540858
130dc5d82d 优化拉流代理逻辑,修复ffmpeg拉流代理鉴权 2023-09-30 06:09:16 +08:00
648540858
32f1a0aa6e
Merge pull request #1094 from lunasaw/wvp-dev-0928
fix hasSubChannel
2023-09-29 06:24:59 +08:00
chenzhangyue
7620527340 fix hasSubChannel 2023-09-28 16:00:05 +08:00
648540858
483d5e04a7 优化拉流代理 2023-09-25 18:51:02 +08:00
648540858
e8411bc797 修复截图截图未关闭流 #1087 2023-09-25 16:22:36 +08:00
648540858
b9a33f03d6 国标级联支持添加通道后主动推动到上级 2023-09-22 17:46:31 +08:00
che_shuai
da63ef5b19 推流列表-->添加通道 补充播放需要的默认参数 媒体服务器ID,是否本平台推送,是否正在推送(影响播放按钮是否显示) 2023-09-22 11:34:10 +08:00
648540858
a34db2ee8b 增加根据国标编号添加国标级联通道的接口 2023-09-21 21:34:02 +08:00
648540858
4ba0e3c13e
Merge pull request #1077 from binban/fix-use-source-ip-as-stream-ip
fix-use-source-ip-as-stream-ip
2023-09-20 09:14:48 +08:00
Cloud User
bc431e4290 fix-use-source-ip-as-stream-ip 2023-09-15 22:39:08 +08:00
648540858
e073b60cb1
Merge pull request #1071 from lunasaw/dev-wvp-0911
generate @param
2023-09-15 14:29:01 +08:00
648540858
2d11f1b3de 修复ssrc缓存初始化判断错误,导致初始化失败 2023-09-15 14:25:08 +08:00
648540858
2d423d9668 Merge branch 'xinchuang' into wvp-28181-2.0 2023-09-15 09:35:14 +08:00
chenzhangyue
54038486f4 generate @param 2023-09-12 20:23:14 +08:00
648540858
d05bce8f7f 修复对接金仓数据库中的问题 2023-09-12 15:32:17 +08:00
648540858
a6fb1cdb74 修复Web页面播放国标录像无声音的问题 2023-09-11 16:17:29 +08:00
648540858
f57ed350b3 添加设置mobilePosition中ChannelId #1054 2023-09-11 11:01:20 +08:00
648540858
4f90b28b93 修复自动点播超时后无法继续点播的问题 2023-09-11 10:36:40 +08:00