From 9c5b1060af4e6c468b2cf95fbb9ec6d0a05fad5c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 28 二月 2022 17:56:27 +0800
Subject: [PATCH] 支持删除在线设备
---
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
index e608361..3f549e5 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
@@ -11,7 +11,8 @@
@Configuration("mediaConfig")
public class MediaConfig{
- @Value("${media.id:}")
+ // 淇敼蹇呴』閰嶇疆锛屼笉鍐嶆敮鎸佽嚜鍔ㄨ幏鍙�
+ @Value("${media.id}")
private String id;
@Value("${media.ip}")
@@ -60,7 +61,7 @@
private String secret;
@Value("${media.stream-none-reader-delay-ms:18000}")
- private String streamNoneReaderDelayMS = "18000";
+ private int streamNoneReaderDelayMS = 18000;
@Value("${media.rtp.enable}")
private boolean rtpEnable;
@@ -93,7 +94,11 @@
}
public String getSipIp() {
- return sipIp;
+ if (sipIp == null) {
+ return this.ip;
+ }else {
+ return sipIp;
+ }
}
public int getHttpPort() {
@@ -137,7 +142,7 @@
return secret;
}
- public String getStreamNoneReaderDelayMS() {
+ public int getStreamNoneReaderDelayMS() {
return streamNoneReaderDelayMS;
}
@@ -183,13 +188,13 @@
mediaServerItem.setIp(ip);
mediaServerItem.setDefaultServer(true);
mediaServerItem.setHookIp(getHookIp());
- mediaServerItem.setSdpIp(sdpIp);
- mediaServerItem.setStreamIp(streamIp);
+ mediaServerItem.setSdpIp(getSdpIp());
+ mediaServerItem.setStreamIp(getStreamIp());
mediaServerItem.setHttpPort(httpPort);
mediaServerItem.setHttpSSlPort(httpSSlPort);
mediaServerItem.setRtmpPort(rtmpPort);
mediaServerItem.setRtmpSSlPort(rtmpSSlPort);
- mediaServerItem.setRtpProxyPort(rtpProxyPort);
+ mediaServerItem.setRtpProxyPort(getRtpProxyPort());
mediaServerItem.setRtspPort(rtspPort);
mediaServerItem.setRtspSSLPort(rtspSSLPort);
mediaServerItem.setAutoConfig(autoConfig);
@@ -199,6 +204,7 @@
mediaServerItem.setRtpPortRange(rtpPortRange);
mediaServerItem.setSendRtpPortRange(sendRtpPortRange);
mediaServerItem.setRecordAssistPort(recordAssistPort);
+ mediaServerItem.setHookAliveInterval(120);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
mediaServerItem.setCreateTime(format.format(System.currentTimeMillis()));
--
Gitblit v1.8.0