From 6bfd48776d72bdc450aa367b490327710f306304 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 12:45:56 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 4e4ba15..928c305 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -1,6 +1,5 @@
package com.genersoft.iot.vmp.common;
-import com.alibaba.fastjson.JSONArray;
public class StreamInfo {
@@ -9,6 +8,9 @@
private String deviceID;
private String channelId;
private String flv;
+
+ private String ip;
+
private String https_flv;
private String ws_flv;
private String wss_flv;
@@ -29,11 +31,15 @@
private String rtsp;
private String rtsps;
private String rtc;
+
+ private String rtcs;
private String mediaServerId;
private Object tracks;
private String startTime;
private String endTime;
private double progress;
+
+ private boolean pause;
public static class TransactionInfo{
public String callId;
@@ -292,4 +298,28 @@
public void setProgress(double progress) {
this.progress = progress;
}
+
+ public String getIp() {
+ return ip;
+ }
+
+ public void setIp(String ip) {
+ this.ip = ip;
+ }
+
+ public String getRtcs() {
+ return rtcs;
+ }
+
+ public void setRtcs(String rtcs) {
+ this.rtcs = rtcs;
+ }
+
+ public boolean isPause() {
+ return pause;
+ }
+
+ public void setPause(boolean pause) {
+ this.pause = pause;
+ }
}
--
Gitblit v1.8.0