From c1b0365b02bc8d5919ca08053eb8a961c1923418 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 12 六月 2024 11:16:21 +0800
Subject: [PATCH] 增加设备上线判断双逻辑，兼容华为设备（前一条的描述大华是错误的，大华没有这个问题）注册后不再发送注册的设备
---
src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
index 5c32ea7..c951e41 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
@@ -32,6 +32,18 @@
@Schema(description = "RTMP绔彛")
private int rtmpPort;
+ @Schema(description = "flv绔彛")
+ private int flvPort;
+
+ @Schema(description = "https-flv绔彛")
+ private int flvSSLPort;
+
+ @Schema(description = "ws-flv绔彛")
+ private int wsFlvPort;
+
+ @Schema(description = "wss-flv绔彛")
+ private int wsFlvSSLPort;
+
@Schema(description = "RTMPS绔彛")
private int rtmpSSlPort;
@@ -88,6 +100,9 @@
@Schema(description = "绫诲瀷锛� zlm/abl")
private String type;
+ @Schema(description = "杞爜鐨勫墠缂�")
+ private String transcodeSuffix;
+
public MediaServer() {
}
@@ -98,7 +113,11 @@
sdpIp = ObjectUtils.isEmpty(zlmServerConfig.getSdpIp())? zlmServerConfig.getIp(): zlmServerConfig.getSdpIp();
streamIp = ObjectUtils.isEmpty(zlmServerConfig.getStreamIp())? zlmServerConfig.getIp(): zlmServerConfig.getStreamIp();
httpPort = zlmServerConfig.getHttpPort();
+ flvPort = zlmServerConfig.getHttpPort();
+ wsFlvPort = zlmServerConfig.getHttpPort();
httpSSlPort = zlmServerConfig.getHttpSSLport();
+ flvSSLPort = zlmServerConfig.getHttpSSLport();
+ wsFlvSSLPort = zlmServerConfig.getHttpSSLport();
rtmpPort = zlmServerConfig.getRtmpPort();
rtmpSSlPort = zlmServerConfig.getRtmpSslPort();
rtpProxyPort = zlmServerConfig.getRtpProxyPort();
@@ -110,6 +129,7 @@
rtpEnable = false; // 榛樿浣跨敤鍗曠鍙�;鐩村埌鐢ㄦ埛鑷繁璁剧疆寮�鍚绔彛
rtpPortRange = zlmServerConfig.getPortRange().replace("_",","); // 榛樿浣跨敤30000,30500浣滀负绾ц仈鏃跺彂閫佹祦鐨勭鍙ｅ彿
recordAssistPort = 0; // 榛樿鍏抽棴
+ transcodeSuffix = zlmServerConfig.getTranscodeSuffix();
}
@@ -328,4 +348,44 @@
public void setType(String type) {
this.type = type;
}
+
+ public int getFlvPort() {
+ return flvPort;
+ }
+
+ public void setFlvPort(int flvPort) {
+ this.flvPort = flvPort;
+ }
+
+ public int getFlvSSLPort() {
+ return flvSSLPort;
+ }
+
+ public void setFlvSSLPort(int flvSSLPort) {
+ this.flvSSLPort = flvSSLPort;
+ }
+
+ public int getWsFlvPort() {
+ return wsFlvPort;
+ }
+
+ public void setWsFlvPort(int wsFlvPort) {
+ this.wsFlvPort = wsFlvPort;
+ }
+
+ public int getWsFlvSSLPort() {
+ return wsFlvSSLPort;
+ }
+
+ public void setWsFlvSSLPort(int wsFlvSSLPort) {
+ this.wsFlvSSLPort = wsFlvSSLPort;
+ }
+
+ public String getTranscodeSuffix() {
+ return transcodeSuffix;
+ }
+
+ public void setTranscodeSuffix(String transcodeSuffix) {
+ this.transcodeSuffix = transcodeSuffix;
+ }
}
--
Gitblit v1.8.0