From bea63f67e75ea6c38d946c2ee463260fcf815f87 Mon Sep 17 00:00:00 2001
From: Fang <costa11@qq.com>
Date: 星期一, 07 三月 2022 14:21:29 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 16 ++++++++--------
1 files changed, 8 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..0626384 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,7 @@
private String rtsps;
private String rtc;
private String mediaServerId;
- private JSONArray tracks;
+ private Object tracks;
public static class TransactionInfo{
public String callId;
@@ -105,11 +105,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 +153,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() {
--
Gitblit v1.8.0