code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-18 00:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

1.优化代码

Browse Source
This commit is contained in:
zhuangpeng.li
2024-07-14 11:25:48 +08:00
parent 12e2203abc
commit d6d506ff6a
4 changed files with 11 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
vue/src/views/components/player/deviceLiveStream.vue
View File

@@ -7,8 +7,6 @@
</el-select>
<span style="margin: 10px 10px 10px 30px">开启拉流:</span>
<el-switch v-model="pushStream" active-color="#13ce66" inactive-color="#c4c6c9" style="border-radius: 10px" :disabled="channelId === ''" @change="startPushStream"></el-switch>
<span style="margin: 10px 10px 10px 30px">开启直播录像:</span>
<el-switch v-model="playrecord" active-color="#13ce66" inactive-color="#c4c6c9" style="border-radius: 10px" :disabled="channelId === ''" @change="startPlayRecord"></el-switch>
</el-row>
<player ref="player" :playerinfo="playinfo" class="components-container"></player>
</div>
@@ -16,7 +14,6 @@
<script>
import player from '@/views/components/player/player.vue';
import { startPlay, closeStream, listChannel } from '@/api/iot/channel';
import { startPlayRecord } from '@/api/iot/record';
export default {
name: 'device-live-stream',
@@ -52,8 +49,6 @@ export default {
ssrc: '',
playurl: '',
playinfo: {},
playrecord: false,
playrecording: false,
playing: false,
pushStream: false,
retrycount: 0,
@@ -136,23 +131,18 @@ export default {
if (!this.$refs.player.isInit) {
this.$refs.player.init();
}
// this.$refs.player.registercallback('loadingTimeout', this.TimeoutCallback);
// this.$refs.player.registercallback('delayTimeout', this.TimeoutCallback);
this.$refs.player.registercallback('loadingTimeout', this.TimeoutCallback);
this.$refs.player.registercallback('delayTimeout', this.TimeoutCallback);
// this.$refs.player.play("https://sample-videos.com/video321/flv/480/big_buck_bunny_480p_1mb.flv");
if (this.playrecord) {
} else {
startPlay(this.deviceId, this.channelId).then((response) => {
const res = response.data;
this.streamId = res.streamId;
this.playurl = res.playurl;
console.log('开始推流: [' + this.streamId + ']');
this.$refs.player.play(res.playurl);
this.playing = true;
this.playrecording = false;
this.pushStream = true;
});;
}
startPlay(this.deviceId, this.channelId).then((response) => {
const res = response.data;
this.streamId = res.streamId;
this.playurl = res.playurl;
console.log('开始推流: [' + this.streamId + ']');
this.$refs.player.play(res.playurl);
this.playing = true;
this.pushStream = true;
});
},
closeStream(force) {
if (force) {
@@ -165,12 +155,8 @@ export default {
this.pushStream = false;
});
this.playing = false;
this.playrecording = false;
}
} else {
if (this.playrecording === true) {
return;
}
if (this.playing && this.streamId) {
console.log('关闭推流3: [' + this.streamId + ']');
closeStream(this.deviceId, this.channelId, this.streamId).then((res) => {
@@ -180,7 +166,6 @@ export default {
this.pushStream = false;
});
this.playing = false;
this.playrecording = false;
}
}
},

3
vue/src/views/iot/sip/mediaServer-edit.vue
View File

@@ -39,9 +39,6 @@
<el-select v-model="mediaServerForm.protocol" style="width: 100%">
<el-option key="http" label="http" value="http"></el-option>
<el-option key="https" label="https" value="https"></el-option>
<el-option key="ws" label="ws" value="ws"></el-option>
<el-option key="rtmp" label="rtmp" value="rtmp"></el-option>
<el-option key="rtsp" label="rtsp" value="rtsp"></el-option>
</el-select>
</el-form-item>
<el-form-item label="HookUrl" prop="hookurl">