From c592740efa9d907eac3ad7d8f6e720608f3e962f Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期日, 01 五月 2022 21:33:56 +0800
Subject: [PATCH] 升级shelljs，解决较高版本node打包时的警告
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 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 c5e2a24..4e4ba15 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -5,7 +5,7 @@
public class StreamInfo {
private String app;
- private String streamId;
+ private String stream;
private String deviceID;
private String channelId;
private String flv;
@@ -30,7 +30,10 @@
private String rtsps;
private String rtc;
private String mediaServerId;
- private JSONArray tracks;
+ private Object tracks;
+ private String startTime;
+ private String endTime;
+ private double progress;
public static class TransactionInfo{
public String callId;
@@ -105,11 +108,11 @@
this.rtsp = rtsp;
}
- public JSONArray getTracks() {
+ public Object getTracks() {
return tracks;
}
- public void setTracks(JSONArray tracks) {
+ public void setTracks(Object tracks) {
this.tracks = tracks;
}
@@ -153,12 +156,12 @@
this.ws_ts = ws_ts;
}
- public String getStreamId() {
- return streamId;
+ public String getStream() {
+ return stream;
}
- public void setStreamId(String streamId) {
- this.streamId = streamId;
+ public void setStream(String stream) {
+ this.stream = stream;
}
public String getRtc() {
@@ -264,4 +267,29 @@
public void setHttps_ts(String https_ts) {
this.https_ts = https_ts;
}
+
+
+ public String getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
+
+ public double getProgress() {
+ return progress;
+ }
+
+ public void setProgress(double progress) {
+ this.progress = progress;
+ }
}
--
Gitblit v1.8.0