From 0802677d0b609abc8de0f0d882c6dbf483fc1987 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期五, 25 六月 2021 16:58:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
index 978ddc3..649fb71 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.storager;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
+import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatform;
import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
@@ -41,16 +41,16 @@
/**
* 鏇存柊娴佸獟浣撲俊鎭�
- * @param mediaServerConfig
+ * @param ZLMServerConfig
* @return
*/
- boolean updateMediaInfo(MediaServerConfig mediaServerConfig);
+ boolean updateMediaInfo(ZLMServerConfig ZLMServerConfig);
/**
* 鑾峰彇娴佸獟浣撲俊鎭�
* @return
*/
- MediaServerConfig getMediaInfo();
+ ZLMServerConfig getMediaInfo();
Map<String, StreamInfo> queryPlayByDeviceId(String deviceId);
@@ -112,4 +112,9 @@
* @param deviceId 璁惧ID
*/
void clearCatchByDeviceId(String deviceId);
+
+ /**
+ * 璁剧疆鎵�鏈夎澶囩绾�
+ */
+ void outlineForAll();
}
--
Gitblit v1.8.0