648540858
|
d340a37a00
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
# src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
|
2022-11-17 11:31:30 +08:00 |
|
648540858
|
694076dc8c
|
优化国标级联发流并发能力
|
2022-11-16 09:39:27 +08:00 |
|
648540858
|
96bb3814f6
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
# Conflicts:
# src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
# src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
# src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
# web_src/src/components/dialog/devicePlayer.vue
# web_src/src/components/live.vue
|
2022-11-08 20:43:25 +08:00 |
|
648540858
|
d040254430
|
Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
|
2022-11-08 20:04:23 +08:00 |
|
648540858
|
f4ee7271e7
|
Merge pull request #661 from xiaoQQya/wvp-28181-2.0
修复分屏监控与视频播放页在 HTTPS 环境下无法播放的问题
|
2022-11-08 20:03:01 +08:00 |
|
648540858
|
4c8e2beb4d
|
优化hook处理速度
|
2022-11-08 19:58:36 +08:00 |
xiaoQQya
|
aae7c80fd5
|
fix(live): 修复分屏监控 HTTPS 环境下无法播放的问题
|
2022-11-05 12:50:26 +08:00 |
|
xiaoQQya
|
189b6044b4
|
fix(devicePlayer): 修复设备视频播放页 HTTPS 环境下 WebRTC 无法播放的问题
|
2022-11-05 11:46:39 +08:00 |
|
xiaoQQya
|
3e71e0bdf1
|
perf(rtcPlayer): 修改控制台 log 级别
|
2022-11-05 11:35:01 +08:00 |
唐嗣成
|
0815b8e130
|
my
|
2022-11-04 17:35:43 +08:00 |
|
648540858
|
aed45e0f0d
|
优化多网卡
|
2022-10-28 16:40:12 +08:00 |
|
648540858
|
0f0ece2401
|
设备编辑增加收流IP
|
2022-10-25 10:17:59 +08:00 |
|
648540858
|
958474c646
|
首页改造完成,添加系统信息
|
2022-10-24 18:14:31 +08:00 |
|
648540858
|
ca891f367c
|
首页改造完成,待添加系统信息
|
2022-10-24 15:20:35 +08:00 |
|
648540858
|
3ffe205082
|
首页改造,完成cpu,内存,网络图
|
2022-10-20 18:03:40 +08:00 |
|
648540858
|
b6bcb5f2f4
|
隐藏liveplayer
|
2022-10-19 10:28:51 +08:00 |
|
648540858
|
b64d701f37
|
隐藏liveplayer
|
2022-10-19 10:07:47 +08:00 |
|
648540858
|
c5b16e058d
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
# Conflicts:
# sql/mysql.sql
|
2022-10-19 10:04:04 +08:00 |
XiaoQiTong
|
b0d0d30781
|
修改云端录像选择节点流媒体path不修改的bug
device表增加的mediaServerId字段丢失，重新添加
|
2022-10-18 20:18:51 +08:00 |
|
648540858
|
55b53caef1
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:35:44 +08:00 |
|
648540858
|
688e222dcc
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-18 17:35:32 +08:00 |
|
648540858
|
3c52a16e5f
|
支持手动添加，为设备设置单独的密码
|
2022-10-18 17:02:05 +08:00 |
|
648540858
|
7918f03734
|
优化按需拉流配置，拉流代理支持按需拉流
|
2022-10-17 16:38:28 +08:00 |
|
648540858
|
4f2191dc9f
|
增加liveplayer播放器
|
2022-10-17 10:30:44 +08:00 |
|
XiaoQiTong
|
dabee4ed7d
|
增加指定流媒体收流功能
|
2022-10-15 20:57:24 +08:00 |
|
648540858
|
710600db6f
|
优化sip消息，去除自动dialog创建
|
2022-09-21 18:18:37 +08:00 |
|
648540858
|
1ee56d50d8
|
Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
|
2022-09-16 18:04:13 +08:00 |
|
648540858
|
692f716788
|
优化点播时RtpServer为正常关闭的问题
|
2022-09-16 18:02:56 +08:00 |
wenyanjun
|
12571e0db1
|
修复下载录像失败问题
|
2022-09-14 14:32:22 +08:00 |
|
648540858
|
221f99c764
|
优化sip消息
|
2022-09-09 17:06:19 +08:00 |
jiang
|
3884e9a56a
|
1.根据redis消息更新推流列表时同时更新在线状态
2.推流列表的模板增加在线状态
|
2022-09-07 15:56:48 +08:00 |
|
648540858
|
e7bdcc1f8d
|
修复选择通道时默认节点显示错误的问题
|
2022-09-06 16:31:28 +08:00 |
|
648540858
|
d5e8aa62a1
|
添加对海康平台录像回放的兼容，修复录像信息发送失败, 级联平台支持开启rtcp保活
|
2022-09-05 17:10:21 +08:00 |
|
648540858
|
3146e63fc0
|
优化异常处理
|
2022-09-01 17:53:00 +08:00 |
|
648540858
|
703c2e292a
|
云端录像详情页添加返回按钮
|
2022-08-31 18:07:53 +08:00 |
|
648540858
|
2de4c322f6
|
去除对redis key过期事件的使用；重构国标级联的注册保活
|
2022-08-31 11:29:13 +08:00 |
|
648540858
|
9f680a2e9e
|
修复bug以及日志按照，错误/sip/数据库 分割
|
2022-08-26 18:03:09 +08:00 |
|
648540858
|
f24b6fa13f
|
优化国标录像的异常判断
|
2022-08-23 11:00:46 +08:00 |
|
648540858
|
042b28b2d6
|
支持全局异常和统一返回结果
|
2022-08-22 16:17:28 +08:00 |
|
648540858
|
5461b8ebf2
|
支持全局异常和统一返回结果，未完待续
|
2022-08-22 16:17:28 +08:00 |
zouyaoji
|
3b5a37c270
|
前端显示媒体服务器配置时报错修复
|
2022-08-06 11:27:02 +08:00 |
|
648540858
|
3adc81764c
|
优化用户表单
|
2022-08-05 17:27:18 +08:00 |
|
648540858
|
d94ceb4fed
|
去除点播界面双loading
|
2022-08-05 17:20:26 +08:00 |
|
648540858
|
231582eb77
|
推流列表增加经纬度的添加
|
2022-08-05 17:10:53 +08:00 |
|
jiang
|
d09d8f11f0
|
修改‘修改pushkey’窗口的标题提示文案
|
2022-08-04 17:01:31 +08:00 |
mrjackwang
|
f93a0d599e
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-08-02 15:32:15 +08:00 |
|
648540858
|
5e4a673ecc
|
修复视频播放点击音量报错 #557，修复编解码信息获取失败
|
2022-08-01 14:33:51 +08:00 |
|
648540858
|
2a5c12746b
|
修复首页未获取到zlm消息时发送错误消息的bug
|
2022-08-01 09:32:39 +08:00 |
|
mrjackwang
|
a59095db0c
|
Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
|
2022-07-29 15:16:39 +08:00 |
|
648540858
|
b957ab61c7
|
bug修复
|
2022-07-26 11:43:56 +08:00 |