From b1b6fae22c5ab3013d73df1a43cd42f7fe0fa347 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 09 四月 2024 10:35:11 +0800
Subject: [PATCH] Merge branch 'master' into dev/zlm
---
web_src/src/components/dialog/devicePlayer.vue | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
old mode 100644
new mode 100755
index 64e6743..f6bd2b2
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -1,13 +1,13 @@
<template>
<div id="devicePlayer" v-loading="isLoging">
- <el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
+ <el-dialog title="瑙嗛鎾斁" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()" v-if="showVideoDialog">
<div style="width: 100%; height: 100%">
<el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer"
v-if="Object.keys(this.player).length > 1">
<el-tab-pane label="Jessibuca" name="jessibuca">
<jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog"
- :videoUrl="videoUrl" :error="videoError" :message="videoError" height="100px"
+ :videoUrl="videoUrl" :error="videoError" :message="videoError" style="height: 515px"
:hasAudio="hasAudio" fluent autoplay live></jessibucaPlayer>
</el-tab-pane>
<el-tab-pane label="WebRTC" name="webRTC">
@@ -16,7 +16,6 @@
:hasAudio="hasAudio" fluent autoplay live></rtc-player>
</el-tab-pane>
<el-tab-pane label="h265web">h265web鏁鏈熷緟</el-tab-pane>
- <el-tab-pane label="wsPlayer">wsPlayer 鏁鏈熷緟</el-tab-pane>
</el-tabs>
<jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca"
:visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError"
@@ -540,25 +539,31 @@
// if (callback )callback();
},
- playFromStreamInfo: function (realHasAudio, streamInfo) {
- this.showVideoDialog = true;
- this.hasaudio = realHasAudio && this.hasaudio;
- this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
- },
- close: function () {
- console.log('鍏抽棴瑙嗛');
- if (!!this.$refs[this.activePlayer]) {
- this.$refs[this.activePlayer].pause();
- }
- this.videoUrl = '';
- this.coverPlaying = false;
- this.showVideoDialog = false;
- if (this.convertKey != '') {
- this.convertStop();
- }
- this.convertKey = ''
- this.stopBroadcast()
- },
+ playFromStreamInfo: function (realHasAudio, streamInfo) {
+ this.showVideoDialog = true;
+ this.hasaudio = realHasAudio && this.hasaudio;
+ if (this.$refs[this.activePlayer]) {
+ this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
+ }else {
+ this.$nextTick(() => {
+ this.$refs[this.activePlayer].play(this.getUrlByStreamInfo(streamInfo))
+ });
+ }
+ },
+ close: function () {
+ console.log('鍏抽棴瑙嗛');
+ if (!!this.$refs[this.activePlayer]){
+ this.$refs[this.activePlayer].pause();
+ }
+ this.videoUrl = '';
+ this.coverPlaying = false;
+ this.showVideoDialog = false;
+ if (this.convertKey != '') {
+ this.convertStop();
+ }
+ this.convertKey = ''
+ this.stopBroadcast()
+ },
copySharedInfo: function (data) {
console.log('澶嶅埗鍐呭锛�' + data);
--
Gitblit v1.8.0