From b73747138d4808a83448e11ee56e766553f511e4 Mon Sep 17 00:00:00 2001
From: xiaoQQya <46475319+xiaoQQya@users.noreply.github.com>
Date: 星期一, 06 十一月 2023 15:43:07 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into develop
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
old mode 100644
new mode 100755
index e577baa..abf6df4
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
@@ -116,6 +116,9 @@
if (streamInfo.getFmp4() != null) {
this.fmp4 = streamInfo.getFmp4().getUrl();
}
+ if (streamInfo.getHttps_fmp4() != null) {
+ this.https_fmp4 = streamInfo.getHttps_fmp4().getUrl();
+ }
if (streamInfo.getWs_fmp4() != null) {
this.ws_fmp4 = streamInfo.getWs_fmp4().getUrl();
}
--
Gitblit v1.8.0