Browse Source

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

pull/93/head
panlinlin 4 years ago
parent
commit
7f48246165
  1. 3
      src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
  2. 1
      src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
  3. 2
      web_src/src/components/StreamProxyList.vue
  4. 9
      web_src/src/components/dialog/StreamProxyEdit.vue

3
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

1
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){

2
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){

9
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) {

Loading…
Cancel
Save