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 viaHeaders = new ArrayList(); - 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()" >
- +
- {{onSubmit_text}} + {{onSubmit_text}} 取消
@@ -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) {