From fc7f1b3459d9c65a37cae25bc254a6a3d62cc6db Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期五, 23 九月 2022 10:55:42 +0800
Subject: [PATCH] 处理上级平台发送的invite请求不携带“y=”sdp信息时，使用默认“y=0000000000”视频无法播放的问题。
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
index 5f68cdf..f8a74fe 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.conf.SipConfig;
+import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
@@ -82,6 +83,9 @@
@Autowired
private GbStreamMapper gbStreamMapper;
+
+ @Autowired
+ private UserSetting userSetting;
@Autowired
private PlatformCatalogMapper catalogMapper;
@@ -614,7 +618,7 @@
*/
@Override
public List<DeviceChannel> queryGbStreamListInPlatform(String platformId) {
- return gbStreamMapper.queryGbStreamListInPlatform(platformId);
+ return gbStreamMapper.queryGbStreamListInPlatform(platformId, userSetting.isUsePushingAsStatus());
}
/**
@@ -695,7 +699,7 @@
return 0;
}
if (platform.getTreeType().equals(TreeType.BUSINESS_GROUP)) {
- if (platformCatalog.getPlatformId().equals(platformCatalog.getParentId())) {
+ if (platform.getDeviceGBId().equals(platformCatalog.getParentId())) {
// 绗竴灞傝妭鐐�
platformCatalog.setBusinessGroupId(platformCatalog.getId());
platformCatalog.setParentId(platform.getDeviceGBId());
--
Gitblit v1.8.0