From d340a37a00c8d5ea2605ca0f40a920efbeb9546f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 17 十一月 2022 11:31:30 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
index bf58187..f3eb3d6 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/MediaServerItem.java
@@ -5,7 +5,6 @@
import com.genersoft.iot.vmp.media.zlm.ZLMServerConfig;
import io.swagger.v3.oas.annotations.media.Schema;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import java.util.HashMap;
@@ -55,7 +54,7 @@
private String secret;
@Schema(description = "keepalive hook瑙﹀彂闂撮殧,鍗曚綅绉�")
- private int hookAliveInterval;
+ private Float hookAliveInterval;
@Schema(description = "鏄惁浣跨敤澶氱鍙ｆā寮�")
private boolean rtpEnable;
@@ -65,9 +64,6 @@
@Schema(description = "澶氱鍙TP鏀舵祦绔彛鑼冨洿")
private String rtpPortRange;
-
- @Schema(description = "RTP鍙戞祦绔彛鑼冨洿")
- private String sendRtpPortRange;
@Schema(description = "assist鏈嶅姟绔彛")
private int recordAssistPort;
@@ -119,7 +115,6 @@
hookAliveInterval = zlmServerConfig.getHookAliveInterval();
rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛
rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
- sendRtpPortRange = "30000,30500"; // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
recordAssistPort = 0; // 榛樿鍏抽棴
}
@@ -324,19 +319,11 @@
this.lastKeepaliveTime = lastKeepaliveTime;
}
- public String getSendRtpPortRange() {
- return sendRtpPortRange;
- }
-
- public void setSendRtpPortRange(String sendRtpPortRange) {
- this.sendRtpPortRange = sendRtpPortRange;
- }
-
- public int getHookAliveInterval() {
+ public Float getHookAliveInterval() {
return hookAliveInterval;
}
- public void setHookAliveInterval(int hookAliveInterval) {
+ public void setHookAliveInterval(Float hookAliveInterval) {
this.hookAliveInterval = hookAliveInterval;
}
}
--
Gitblit v1.8.0