From 4d9a62339d43e163c3615a52b72a3c3f01cc30ab Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 16 十月 2020 16:49:41 +0800
Subject: [PATCH] 去除lombok框架 添加流传输模式udp/tcp被动支持
---
web_src/src/components/gb28181/devicePlayer.vue | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/gb28181/devicePlayer.vue
index dc69adb..2f2cfc0 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/gb28181/devicePlayer.vue
@@ -1,7 +1,8 @@
<template>
<div id="devicePlayer">
- <el-dialog title="瑙嗛鎾斁" top="0" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="stop()">
- <LivePlayer v-if="showVideoDialog" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" fluent autoplay live stretch></LivePlayer>
+ <el-dialog title="瑙嗛鎾斁" top="0" :visible.sync="showVideoDialog" :destroy-on-close="true" @close="close()">
+ <LivePlayer v-if="showVideoDialog && hasaudio" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" hasaudio fluent autoplay live ></LivePlayer>
+ <LivePlayer v-if="showVideoDialog && !hasaudio" ref="videoPlayer" :videoUrl="videoUrl" :error="videoError" fluent autoplay live ></LivePlayer>
<div id="shared" style="text-align: right; margin-top: 1rem;">
<el-tabs v-model="tabActiveName">
<el-tab-pane label="濯掍綋娴佷俊鎭�" name="media">
@@ -114,38 +115,42 @@
ssrc: '',
deviceId: '',
channelId: '',
- tabActiveName: 'media'
+ tabActiveName: 'media',
+ hasaudio: false
};
},
methods: {
- play: function(streamInfo, deviceId, channelId) {
+ play: function(streamInfo, deviceId, channelId, hasAudio) {
+ // this.hasaudio = hasAudio;
+ if (!hasAudio) { // hasaudio == false鏃惰缃挱鏀惧櫒hasaudio false, 鍚﹀垯涓嶈缃�
+ this.hasaudio = hasAudio;
+ }
+ // 鏍规嵁濯掍綋娴佷俊鎭簩娆″垽鏂�
+ // if( this.hasaudio && !!streamInfo.tracks && streamInfo.tracks.length > 0) {
+ // var realHasAudio = false;
+ // for (let i = 0; i < streamInfo.tracks; i++) {
+ // if (streamInfo.tracks[i].codec_type == 1) { // 鍒ゆ柇涓洪煶棰�
+ // realHasAudio = true;
+ // }
+ // }
+ // this.hasaudio = realHasAudio && this.hasaudio;
+ // }
this.ssrc = streamInfo.ssrc;
this.deviceId = deviceId;
this.channelId = channelId;
- this.videoUrl = streamInfo.flv + "?" + new Date().getTime();
+ // this.$refs.videoPlayer.hasaudio = hasAudio;
+ // this.videoUrl = streamInfo.flv + "?" + new Date().getTime();
+ this.videoUrl = streamInfo.ws_flv;
this.showVideoDialog = true;
console.log(this.ssrc);
},
- stop: function() {
+ close: function() {
console.log('鍏抽棴瑙嗛');
this.$refs.videoPlayer.pause();
this.videoUrl = '';
this.showVideoDialog = false;
- this.$axios({
- method: 'post',
- url: '/api/play/' + this.ssrc + '/stop'
- }).then(function(res) {
- console.log(JSON.stringify(res));
- });
-
- this.$axios({
- method: 'post',
- url: '/api/playback/' + this.ssrc + '/stop'
- }).then(function(res) {
- console.log(JSON.stringify(res));
- });
},
copySharedInfo: function(data) {
console.log('澶嶅埗鍐呭锛�' + data);
--
Gitblit v1.8.0