From 3ec3b88456cf9ac455d93baba40f339bb284dd77 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 十月 2020 14:39:10 +0800
Subject: [PATCH] 修复点播判断错误导致的15s超长延时 增加默认不关闭推流, 无人观看超时或点击停止按钮关闭流 修复点播其他bug

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
index 2694de3..2d79839 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -16,10 +16,6 @@
 	String sipId;
 	@Value("${sip.password}")
 	String sipPassword;
-	@Value("${media.ip}")
-	String mediaIp;
-	@Value("${media.port}")
-	Integer mediaPort;
 	
 	@Value("${sip.ptz.speed:50}")
 	Integer speed;
@@ -54,22 +50,6 @@
 
 	public void setSipPassword(String sipPassword) {
 		this.sipPassword = sipPassword;
-	}
-
-	public String getMediaIp() {
-		return mediaIp;
-	}
-
-	public void setMediaIp(String mediaIp) {
-		this.mediaIp = mediaIp;
-	}
-
-	public Integer getMediaPort() {
-		return mediaPort;
-	}
-
-	public void setMediaPort(Integer mediaPort) {
-		this.mediaPort = mediaPort;
 	}
 
 	public Integer getSpeed() {

--
Gitblit v1.8.0