From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
index 579842d..9beac16 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java
@@ -67,7 +67,9 @@
// 浣跨敤寮傛鐨勫綋鏃舵洿鏂板獟浣撴祦鍒楄〃
zlmresTfulUtils.getMediaList(mediaServerItem, (mediaList ->{
- if (mediaList == null) return;
+ if (mediaList == null) {
+ return;
+ }
String dataStr = mediaList.getString("data");
Integer code = mediaList.getInteger("code");
@@ -176,7 +178,9 @@
//浣跨敤寮傛鏇存柊鎺ㄦ祦
zlmresTfulUtils.getMediaList(mediaServerItem, app, streamId, "rtmp", json->{
- if (json == null) return;
+ if (json == null) {
+ return;
+ }
String dataStr = json.getString("data");
Integer code = json.getInteger("code");
@@ -204,6 +208,7 @@
if (streamProxyItem == null) {
result = storager.removeMedia(app, streamId);
}else {
+ // TODO 鏆備笉璁剧疆涓虹绾�
result =storager.mediaOutline(app, streamId);
}
return result;
--
Gitblit v1.8.0