From 7f48246165b3c815e928cee04f8d4e2cf689b6aa Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: Thu, 22 Apr 2021 18:09:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=BD=95=E5=83=8F=E6=92=AD=E6=94=BE=E7=9A=84=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gb28181/transmit/cmd/SIPRequestHeaderProvider.java   | 3 +--
 .../genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 1 -
 web_src/src/components/StreamProxyList.vue               | 2 +-
 web_src/src/components/dialog/StreamProxyEdit.vue        | 9 +++++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
index cecbe3c0..691bc429 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
@@ -37,8 +37,7 @@ public class SIPRequestHeaderProvider {
 		SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());
 		// via
 		ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
-		ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(),
-				device.getTransport(), viaTag);
+		ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
 		viaHeader.setRPort();
 		viaHeaders.add(viaHeader);
 		// from
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 14719cc4..57956908 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -254,7 +254,6 @@ public class ZLMHttpHookListener {
 			System.out.println("on_stream_changed->>" + schema);
 		}
 		if ("rtmp".equals(schema)){
-
 			if ("rtp".equals(app) && !regist ) {
 				StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
 				if (streamInfo!=null){
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index ee3d43c3..0e0fcdd5 100644
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -194,7 +194,7 @@
 					          that.initData()
                 }).catch(function (error) {
                     console.log(error);
-					that.getListLoading = false;
+					          that.getListLoading = false;
                 });
 			},
 			start: function(row){
diff --git a/web_src/src/components/dialog/StreamProxyEdit.vue b/web_src/src/components/dialog/StreamProxyEdit.vue
index 66f63ad1..696379eb 100644
--- a/web_src/src/components/dialog/StreamProxyEdit.vue
+++ b/web_src/src/components/dialog/StreamProxyEdit.vue
@@ -10,7 +10,7 @@
       @close="close()"
     >
       <div id="shared" style="margin-top: 1rem;margin-right: 100px;">
-        <el-form ref="streamProxy" :rules="rules" :model="proxyParam" label-width="140px">
+        <el-form ref="streamProxy" :rules="rules" :model="proxyParam" label-width="140px" >
               <el-form-item label="类型" prop="type">
                 <el-select
                   v-model="proxyParam.type"
@@ -66,7 +66,7 @@
               </el-form-item>
               <el-form-item>
                 <div style="float: right;">
-                  <el-button type="primary" @click="onSubmit">{{onSubmit_text}}</el-button>
+                  <el-button type="primary" @click="onSubmit" :loading="dialogLoading" >{{onSubmit_text}}</el-button>
                   <el-button @click="close">取消</el-button>
                 </div>
 
@@ -104,6 +104,7 @@ export default {
       listChangeCallback: null,
       showDialog: false,
       isLoging: false,
+      dialogLoading: false,
       onSubmit_text: "立即创建",
       proxyParam: {
           name: null,
@@ -145,12 +146,14 @@ export default {
     },
     onSubmit: function () {
       console.log("onSubmit");
+      this.dialogLoading = true;
       var that = this;
       that.$axios({
         method: 'post',
         url:`/api/proxy/save`,
         data: that.proxyParam
       }).then(function (res) {
+        that.dialogLoading = false;
         if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
           that.$message({
             showClose: true,
@@ -164,11 +167,13 @@ export default {
         }
       }).catch(function (error) {
         console.log(error);
+        this.dialogLoading = false;
       });
     },
     close: function () {
       console.log("关闭添加视频平台");
       this.showDialog = false;
+      this.dialogLoading = false;
       this.$refs.streamProxy.resetFields();
     },
     deviceGBIdExit: async function (deviceGbId) {