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 | 32 ++++++++++----------------------
1 files changed, 10 insertions(+), 22 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 339389f..2d79839 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -12,12 +12,10 @@
Integer sipPort;
@Value("${sip.domain}")
String sipDomain;
+ @Value("${sip.id}")
+ 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 +52,6 @@
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() {
return speed;
}
@@ -77,6 +59,12 @@
public void setSpeed(Integer speed) {
this.speed = speed;
}
-
-
+
+ public String getSipId() {
+ return sipId;
+ }
+
+ public void setSipId(String sipId) {
+ this.sipId = sipId;
+ }
}
--
Gitblit v1.8.0