guzijian / wvp-GB28181-pro · Commits

Commit 7f48246165b3c815e928cee04f8d4e2cf689b6aa

Authored by panlinlin
1 parent a29a0a07

增加对设备录像播放的兼容性

Inline Side-by-side
Showing 4 changed files with 9 additions and 6 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  View file @7f48246
... ... @@ -37,8 +37,7 @@ public class SIPRequestHeaderProvider {
37 37 SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());
38 38 // via
39 39 ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
40   - ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(),
41   - device.getTransport(), viaTag);
  40 + ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
42 41 viaHeader.setRPort();
43 42 viaHeaders.add(viaHeader);
44 43 // from
... ...
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  View file @7f48246
... ... @@ -254,7 +254,6 @@ public class ZLMHttpHookListener {
254 254 System.out.println("on_stream_changed->>" + schema);
255 255 }
256 256 if ("rtmp".equals(schema)){
257   -
258 257 if ("rtp".equals(app) && !regist ) {
259 258 StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
260 259 if (streamInfo!=null){
... ...
web_src/src/components/StreamProxyList.vue
  View file @7f48246
... ... @@ -194,7 +194,7 @@
194 194 that.initData()
195 195 }).catch(function (error) {
196 196 console.log(error);
197   - that.getListLoading = false;
  197 + that.getListLoading = false;
198 198 });
199 199 },
200 200 start: function(row){
... ...
web_src/src/components/dialog/StreamProxyEdit.vue
  View file @7f48246
... ... @@ -10,7 +10,7 @@
10 10 @close="close()"
11 11 >
12 12 <div id="shared" style="margin-top: 1rem;margin-right: 100px;">
13   - <el-form ref="streamProxy" :rules="rules" :model="proxyParam" label-width="140px">
  13 + <el-form ref="streamProxy" :rules="rules" :model="proxyParam" label-width="140px" >
14 14 <el-form-item label="类型" prop="type">
15 15 <el-select
16 16 v-model="proxyParam.type"
... ... @@ -66,7 +66,7 @@
66 66 </el-form-item>
67 67 <el-form-item>
68 68 <div style="float: right;">
69   - <el-button type="primary" @click="onSubmit">{{onSubmit_text}}</el-button>
  69 + <el-button type="primary" @click="onSubmit" :loading="dialogLoading" >{{onSubmit_text}}</el-button>
70 70 <el-button @click="close">取消</el-button>
71 71 </div>
72 72  
... ... @@ -104,6 +104,7 @@ export default {
104 104 listChangeCallback: null,
105 105 showDialog: false,
106 106 isLoging: false,
  107 + dialogLoading: false,
107 108 onSubmit_text: "立即创建",
108 109 proxyParam: {
109 110 name: null,
... ... @@ -145,12 +146,14 @@ export default {
145 146 },
146 147 onSubmit: function () {
147 148 console.log("onSubmit");
  149 + this.dialogLoading = true;
148 150 var that = this;
149 151 that.$axios({
150 152 method: 'post',
151 153 url:`/api/proxy/save`,
152 154 data: that.proxyParam
153 155 }).then(function (res) {
  156 + that.dialogLoading = false;
154 157 if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
155 158 that.$message({
156 159 showClose: true,
... ... @@ -164,11 +167,13 @@ export default {
164 167 }
165 168 }).catch(function (error) {
166 169 console.log(error);
  170 + this.dialogLoading = false;
167 171 });
168 172 },
169 173 close: function () {
170 174 console.log("关闭添加视频平台");
171 175 this.showDialog = false;
  176 + this.dialogLoading = false;
172 177 this.$refs.streamProxy.resetFields();
173 178 },
174 179 deviceGBIdExit: async function (deviceGbId) {
... ...