From 12fa3b4c8da2af13a710400d64c9fe6d5d6b1e5e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 23 十一月 2022 09:57:17 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java | 33 ++++++++++++---------------------
1 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
index ea0bdca..b0e74e8 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
@@ -31,8 +31,8 @@
private String rtp_type;
@Schema(description = "鏄惁鍚敤")
private boolean enable;
- @Schema(description = "鏄惁鍚敤HLS")
- private boolean enable_hls;
+ @Schema(description = "鏄惁鍚敤闊抽")
+ private boolean enable_audio;
@Schema(description = "鏄惁鍚敤MP4")
private boolean enable_mp4;
@Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃跺垹闄�")
@@ -40,8 +40,6 @@
@Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃惰嚜鍔ㄥ仠鐢�")
private boolean enable_disable_none_reader;
- @Schema(description = "涓婄骇骞冲彴鍥芥爣ID")
- private String platformGbId;
@Schema(description = "鍒涘缓鏃堕棿")
private String createTime;
@@ -139,14 +137,6 @@
this.enable = enable;
}
- public boolean isEnable_hls() {
- return enable_hls;
- }
-
- public void setEnable_hls(boolean enable_hls) {
- this.enable_hls = enable_hls;
- }
-
public boolean isEnable_mp4() {
return enable_mp4;
}
@@ -155,19 +145,12 @@
this.enable_mp4 = enable_mp4;
}
-
- public String getPlatformGbId() {
- return platformGbId;
- }
-
- public void setPlatformGbId(String platformGbId) {
- this.platformGbId = platformGbId;
- }
-
+ @Override
public String getCreateTime() {
return createTime;
}
+ @Override
public void setCreateTime(String createTime) {
this.createTime = createTime;
}
@@ -187,4 +170,12 @@
public void setEnable_disable_none_reader(boolean enable_disable_none_reader) {
this.enable_disable_none_reader = enable_disable_none_reader;
}
+
+ public boolean isEnable_audio() {
+ return enable_audio;
+ }
+
+ public void setEnable_audio(boolean enable_audio) {
+ this.enable_audio = enable_audio;
+ }
}
--
Gitblit v1.8.0