增加对设备录像播放的兼容性
parent
a29a0a0785
commit
7f48246165
|
@ -37,8 +37,7 @@ public class SIPRequestHeaderProvider {
|
||||||
SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());
|
SipURI requestURI = sipFactory.createAddressFactory().createSipURI(device.getDeviceId(), device.getHostAddress());
|
||||||
// via
|
// via
|
||||||
ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
|
ArrayList<ViaHeader> viaHeaders = new ArrayList<ViaHeader>();
|
||||||
ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(),
|
ViaHeader viaHeader = sipFactory.createHeaderFactory().createViaHeader(sipConfig.getSipIp(), sipConfig.getSipPort(), device.getTransport(), viaTag);
|
||||||
device.getTransport(), viaTag);
|
|
||||||
viaHeader.setRPort();
|
viaHeader.setRPort();
|
||||||
viaHeaders.add(viaHeader);
|
viaHeaders.add(viaHeader);
|
||||||
// from
|
// from
|
||||||
|
|
|
@ -254,7 +254,6 @@ public class ZLMHttpHookListener {
|
||||||
System.out.println("on_stream_changed->>" + schema);
|
System.out.println("on_stream_changed->>" + schema);
|
||||||
}
|
}
|
||||||
if ("rtmp".equals(schema)){
|
if ("rtmp".equals(schema)){
|
||||||
|
|
||||||
if ("rtp".equals(app) && !regist ) {
|
if ("rtp".equals(app) && !regist ) {
|
||||||
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
|
StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);
|
||||||
if (streamInfo!=null){
|
if (streamInfo!=null){
|
||||||
|
|
|
@ -66,7 +66,7 @@
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item>
|
<el-form-item>
|
||||||
<div style="float: right;">
|
<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>
|
<el-button @click="close">取消</el-button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
@ -104,6 +104,7 @@ export default {
|
||||||
listChangeCallback: null,
|
listChangeCallback: null,
|
||||||
showDialog: false,
|
showDialog: false,
|
||||||
isLoging: false,
|
isLoging: false,
|
||||||
|
dialogLoading: false,
|
||||||
onSubmit_text: "立即创建",
|
onSubmit_text: "立即创建",
|
||||||
proxyParam: {
|
proxyParam: {
|
||||||
name: null,
|
name: null,
|
||||||
|
@ -145,12 +146,14 @@ export default {
|
||||||
},
|
},
|
||||||
onSubmit: function () {
|
onSubmit: function () {
|
||||||
console.log("onSubmit");
|
console.log("onSubmit");
|
||||||
|
this.dialogLoading = true;
|
||||||
var that = this;
|
var that = this;
|
||||||
that.$axios({
|
that.$axios({
|
||||||
method: 'post',
|
method: 'post',
|
||||||
url:`/api/proxy/save`,
|
url:`/api/proxy/save`,
|
||||||
data: that.proxyParam
|
data: that.proxyParam
|
||||||
}).then(function (res) {
|
}).then(function (res) {
|
||||||
|
that.dialogLoading = false;
|
||||||
if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
|
if (typeof (res.data.code) != "undefined" && res.data.code === 0) {
|
||||||
that.$message({
|
that.$message({
|
||||||
showClose: true,
|
showClose: true,
|
||||||
|
@ -164,11 +167,13 @@ export default {
|
||||||
}
|
}
|
||||||
}).catch(function (error) {
|
}).catch(function (error) {
|
||||||
console.log(error);
|
console.log(error);
|
||||||
|
this.dialogLoading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
close: function () {
|
close: function () {
|
||||||
console.log("关闭添加视频平台");
|
console.log("关闭添加视频平台");
|
||||||
this.showDialog = false;
|
this.showDialog = false;
|
||||||
|
this.dialogLoading = false;
|
||||||
this.$refs.streamProxy.resetFields();
|
this.$refs.streamProxy.resetFields();
|
||||||
},
|
},
|
||||||
deviceGBIdExit: async function (deviceGbId) {
|
deviceGBIdExit: async function (deviceGbId) {
|
||||||
|
|
Loading…
Reference in New Issue