From 87acd73efcde49cb5630c266db4ebd3f6b1b9dfd Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 06 四月 2021 15:13:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java | 19 ++++++++++++++-----
1 files changed, 14 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 0fb76b9..1c24eb9 100644
--- a/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/common/StreamInfo.java
@@ -4,9 +4,10 @@
public class StreamInfo {
+ private String app;
private String streamId;
private String deviceID;
- private String cahnnelId;
+ private String channelId;
private String flv;
private String ws_flv;
private String fmp4;
@@ -19,6 +20,14 @@
private String rtsp;
private JSONArray tracks;
+ public String getApp() {
+ return app;
+ }
+
+ public void setApp(String app) {
+ this.app = app;
+ }
+
public String getDeviceID() {
return deviceID;
}
@@ -27,12 +36,12 @@
this.deviceID = deviceID;
}
- public String getCahnnelId() {
- return cahnnelId;
+ public String getChannelId() {
+ return channelId;
}
- public void setCahnnelId(String cahnnelId) {
- this.cahnnelId = cahnnelId;
+ public void setChannelId(String channelId) {
+ this.channelId = channelId;
}
public String getFlv() {
--
Gitblit v1.8.0