From 57a230afb3b02cedf8ec39cd60e5163f953e3260 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 25 六月 2024 09:45:34 +0800
Subject: [PATCH] Merge branch 'refs/heads/2.7.1'
---
src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 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 21911b9..66b483b 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/IRedisCatchStorage.java
@@ -2,10 +2,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.common.SystemAllInfo;
-import com.genersoft.iot.vmp.gb28181.bean.AlarmChannelMessage;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.bean.ParentPlatformCatch;
-import com.genersoft.iot.vmp.gb28181.bean.SendRtpItem;
+import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.media.bean.MediaServer;
import com.genersoft.iot.vmp.media.event.media.MediaArrivalEvent;
@@ -138,6 +135,8 @@
MediaInfo getStreamInfo(String app, String streamId, String mediaServerId);
+ MediaInfo getProxyStream(String app, String streamId);
+
void addCpuInfo(double cpuInfo);
void addMemInfo(double memInfo);
@@ -211,7 +210,7 @@
void sendChannelAddOrDelete(String deviceId, String channelId, boolean add);
- void sendPlatformStartPlayMsg(MessageForPushChannel messageForPushChannel);
+ void sendPlatformStartPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform);
void sendPlatformStopPlayMsg(SendRtpItem sendRtpItem, ParentPlatform platform);
--
Gitblit v1.8.0