From 08696a57d308108a771085fab7aa3bd0c19d2120 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 三月 2024 14:28:24 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
index a6cbe86..979797d 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -1,5 +1,7 @@
package com.genersoft.iot.vmp.common;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
+import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import io.swagger.v3.oas.annotations.media.Schema;
import java.io.Serializable;
@@ -69,13 +71,15 @@
@Schema(description = "娴佸獟浣揑D")
private String mediaServerId;
@Schema(description = "娴佺紪鐮佷俊鎭�")
- private Object tracks;
+ private MediaInfo mediaInfo;
@Schema(description = "寮�濮嬫椂闂�")
private String startTime;
@Schema(description = "缁撴潫鏃堕棿")
private String endTime;
@Schema(description = "杩涘害锛堝綍鍍忎笅杞戒娇鐢級")
private double progress;
+ @Schema(description = "鏂囦欢涓嬭浇鍦板潃锛堝綍鍍忎笅杞戒娇鐢級")
+ private DownloadFileInfo downLoadFilePath;
@Schema(description = "鏄惁鏆傚仠锛堝綍鍍忓洖鏀句娇鐢級")
private boolean pause;
@@ -470,12 +474,12 @@
this.mediaServerId = mediaServerId;
}
- public Object getTracks() {
- return tracks;
+ public MediaInfo getMediaInfo() {
+ return mediaInfo;
}
- public void setTracks(Object tracks) {
- this.tracks = tracks;
+ public void setMediaInfo(MediaInfo mediaInfo) {
+ this.mediaInfo = mediaInfo;
}
public String getStartTime() {
@@ -605,5 +609,11 @@
this.subStream = subStream;
}
+ public DownloadFileInfo getDownLoadFilePath() {
+ return downLoadFilePath;
+ }
+ public void setDownLoadFilePath(DownloadFileInfo downLoadFilePath) {
+ this.downLoadFilePath = downLoadFilePath;
+ }
}
--
Gitblit v1.8.0