From e0b54ac38dc1d3f09369064443c6460f1c7f5e4d Mon Sep 17 00:00:00 2001 From: xubinbin <1323875150@qq.com> Date: Sat, 14 Sep 2024 10:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B1=E4=BA=8EZLM=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84api=E6=8E=A5=E5=8F=A3=E3=80=90getMed?= =?UTF-8?q?iaInfo=E3=80=91=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E4=B8=8D?= =?UTF-8?q?=E5=9C=A8=E5=8C=85=E5=90=ABonline=E5=80=BC=EF=BC=8C=E5=9B=A0?= =?UTF-8?q?=E6=AD=A4=E5=8F=AA=E8=83=BD=E6=A0=B9=E6=8D=AE=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E3=80=90getMediaInfo=E3=80=91=E6=8E=A5=E5=8F=A3=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9Ecode=E5=80=BC=E4=B8=BA=E2=80=9C0?= =?UTF-8?q?=E2=80=9D=E6=97=B6=E6=9D=A5=E8=AE=BE=E7=BD=AEonline=E7=9A=84?= =?UTF-8?q?=E5=80=BC=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/genersoft/iot/vmp/media/bean/MediaInfo.java | 4 ---- .../iot/vmp/media/zlm/ZLMMediaNodeServerService.java | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java index 2dd92eb56..0fae32c9b 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java +++ b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaInfo.java @@ -58,16 +58,12 @@ public class MediaInfo { String schema = jsonObject.getString("schema"); mediaInfo.setSchema(schema); Integer totalReaderCount = jsonObject.getInteger("totalReaderCount"); - Boolean online = jsonObject.getBoolean("online"); Integer originType = jsonObject.getInteger("originType"); Long aliveSecond = jsonObject.getLong("aliveSecond"); Long bytesSpeed = jsonObject.getLong("bytesSpeed"); if (totalReaderCount != null) { mediaInfo.setReaderCount(totalReaderCount); } - if (online != null) { - mediaInfo.setOnline(online); - } if (originType != null) { mediaInfo.setOriginType(originType); } diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java index 43443433d..a6ab6d683 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java @@ -182,6 +182,7 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { } JSONObject mediaJSON = data.getJSONObject(0); MediaInfo mediaInfo = MediaInfo.getInstance(mediaJSON, mediaServer); + mediaInfo.setOnline(true); StreamInfo streamInfo = getStreamInfoByAppAndStream(mediaServer, app, stream, mediaInfo, callId, true); if (streamInfo != null) { streamInfoList.add(streamInfo); @@ -232,7 +233,9 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService { if (jsonObject.getInteger("code") != 0) { return null; } - return MediaInfo.getInstance(jsonObject, mediaServer); + MediaInfo mediaInfo = MediaInfo.getInstance(jsonObject, mediaServer); + mediaInfo.setOnline(true); + return mediaInfo; } @Override