From 6e4fc1e79b7b4b91d6eb36f6b5638fa902665a50 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期六, 23 四月 2022 23:34:36 +0800
Subject: [PATCH] 1.修正了播放地址无法正常播放视频的问题，包含两个错误： 1.1修正播放器界面路由（此页面不需要layout边框，之前已经修复但在地图代码合并时又被错误覆盖） 1.2修正播放器id属性，此属性现在不需要父级组件传入（这是之前导致独立播放页面失效的主要原因） 2.调整滚动条美化样式到app.vue中，使其真正全局生效
---
src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java b/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
index 41b68cc..cf16f86 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipPlatformRunner.java
@@ -3,9 +3,9 @@
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
-import com.genersoft.iot.vmp.media.zlm.ZLMRTPServerFactory;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommanderForPlatform;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.core.annotation.Order;
@@ -21,7 +21,7 @@
public class SipPlatformRunner implements CommandLineRunner {
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -30,7 +30,7 @@
private EventPublisher publisher;
@Autowired
- private ZLMRTPServerFactory zlmrtpServerFactory;
+ private ISIPCommanderForPlatform sipCommanderForPlatform;
@Override
@@ -57,8 +57,11 @@
parentPlatformCatch.setId(parentPlatform.getServerGBId());
redisCatchStorage.updatePlatformCatchInfo(parentPlatformCatch);
- // 鍙戦�佸钩鍙版湭娉ㄥ唽娑堟伅
- publisher.platformNotRegisterEventPublish(parentPlatform.getServerGBId());
+ // 鍙栨秷璁㈤槄
+ sipCommanderForPlatform.unregister(parentPlatform, null, (eventResult)->{
+ // 鍙戦�佸钩鍙版湭娉ㄥ唽娑堟伅
+ publisher.platformNotRegisterEventPublish(parentPlatform.getServerGBId());
+ });
}
}
}
--
Gitblit v1.8.0