From f2279859b367fda6108a5ea22c572d38d89d338d Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期六, 26 十二月 2020 16:44:27 +0800
Subject: [PATCH] 增加对水星IPC的兼容 增加对SIP错误的订阅,刷新通道或点播或回放出现sip错误时及时返回给页面 优化UI,增加按钮loading

---
 src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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 2d79839..52d8089 100644
--- a/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/conf/SipConfig.java
@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.conf;
 
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 
@@ -44,6 +45,14 @@
 		this.sipDomain = sipDomain;
 	}
 
+	public String getSipId() {
+		return sipId;
+	}
+
+	public void setSipId(String sipId) {
+		this.sipId = sipId;
+	}
+
 	public String getSipPassword() {
 		return sipPassword;
 	}
@@ -58,13 +67,5 @@
 
 	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