From 3009951e45cf4237436272598226b6cb3e362464 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 23 Sep 2025 23:07:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=92=AD=E6=94=BE=E6=95=88?=
 =?UTF-8?q?=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/cloudRecord/cloudRecordPlayer.vue   |  1 +
 web/src/views/common/jessibuca.vue            | 50 +++++++++++--------
 web/src/views/dialog/devicePlayer.vue         | 33 ++++++------
 3 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/web/src/views/cloudRecord/cloudRecordPlayer.vue b/web/src/views/cloudRecord/cloudRecordPlayer.vue
index 91f66bcf0..1962b4212 100755
--- a/web/src/views/cloudRecord/cloudRecordPlayer.vue
+++ b/web/src/views/cloudRecord/cloudRecordPlayer.vue
@@ -295,6 +295,7 @@ export default {
       } else {
         this.videoUrl = streamInfo['ws_flv']
       }
+      console.log(location.protocol)
       this.streamInfo = streamInfo
       this.timeLen = timeLen
       this.startTime = startTime
diff --git a/web/src/views/common/jessibuca.vue b/web/src/views/common/jessibuca.vue
index 64276d795..e6da5b8d9 100755
--- a/web/src/views/common/jessibuca.vue
+++ b/web/src/views/common/jessibuca.vue
@@ -5,7 +5,7 @@
     @dblclick="fullscreenSwich"
   >
     <div style="width:100%; padding-top: 56.25%; position: relative;" />
-    <div id="buttonsBox" class="buttons-box" v-if="typeof showButton == 'undefined' || showButton">
+    <div id="buttonsBox" class="buttons-box" >
       <div class="buttons-box-left">
         <i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick" />
         <i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause" />
@@ -57,9 +57,12 @@ export default {
   watch: {
     videoUrl: {
       handler(val, _) {
-        this.$nextTick(() => {
-          this.play(val)
-        })
+        if (val) {
+          this.$nextTick(() => {
+            console.log(22222111)
+            this.play(val)
+          })
+        }
       },
       immediate: true
     }
@@ -67,7 +70,7 @@ export default {
   created() {
     const paramUrl = decodeURIComponent(this.$route.params.url)
     this.$nextTick(() => {
-      if (typeof (this.videoUrl) === 'undefined') {
+      if (typeof (this.videoUrl) === 'undefined' || typeof (paramUrl) !== 'undefined') {
         this.videoUrl = paramUrl
       }
       this.btnDom = document.getElementById('buttonsBox')
@@ -89,16 +92,21 @@ export default {
       if (jessibucaPlayer[this._uid]) {
         jessibucaPlayer[this._uid].destroy()
       }
-      this.$refs.container.dataset['jessibuca'] = undefined
+      console.log(1111)
+      console.log(this.$refs.container.dataset['jessibuca'])
+      if (this.$refs.container.dataset['jessibuca']) {
+        this.$refs.container.dataset['jessibuca'] = undefined
+      }
+
       if (this.$refs.container.getAttribute('data-jessibuca')) {
         this.$refs.container.removeAttribute('data-jessibuca')
       }
       const options = {
         container: this.$refs.container,
         videoBuffer: 0,
-        isResize: false,
+        isResize: true,
         useMSE: true,
-        useWCS: true,
+        useWCS: false,
         text: '',
         // background: '',
         controlAutoHide: false,
@@ -193,7 +201,6 @@ export default {
         console.log('Jessibuca -> playToRenderTimes: ', msg)
       })
       jessibuca.on('timeUpdate', (videoPTS) => {
-        console.log(videoPTS)
         if (jessibuca.videoPTS) {
           this.playerTime += (videoPTS - jessibuca.videoPTS)
           this.$emit('playTimeChange', this.playerTime)
@@ -210,18 +217,21 @@ export default {
         this.destroy()
       }
       this.create()
-      jessibucaPlayer[this._uid].on('play', () => {
-        this.playing = true
-        this.loaded = true
-        this.quieting = jessibuca.quieting
-      })
-      if (jessibucaPlayer[this._uid].hasLoaded()) {
-        jessibucaPlayer[this._uid].play(url)
-      } else {
-        jessibucaPlayer[this._uid].on('load', () => {
-          jessibucaPlayer[this._uid].play(url)
+      this.$nextTick(() => {
+        jessibucaPlayer[this._uid].on('play', () => {
+          this.playing = true
+          this.loaded = true
+          this.quieting = jessibuca.quieting
         })
-      }
+        if (jessibucaPlayer[this._uid].hasLoaded()) {
+          jessibucaPlayer[this._uid].play(url)
+        } else {
+          jessibucaPlayer[this._uid].on('load', () => {
+            jessibucaPlayer[this._uid].play(url)
+          })
+        }
+      })
+
     },
     pause: function() {
       if (jessibucaPlayer[this._uid]) {
diff --git a/web/src/views/dialog/devicePlayer.vue b/web/src/views/dialog/devicePlayer.vue
index 611446417..927aef8a0 100755
--- a/web/src/views/dialog/devicePlayer.vue
+++ b/web/src/views/dialog/devicePlayer.vue
@@ -21,20 +21,19 @@
           @tab-click="changePlayer"
         >
           <el-tab-pane label="Jessibuca" name="jessibuca">
-            <div style="height: 22.5vw">
-              <jessibucaPlayer
-                v-if="activePlayer === 'jessibuca'"
-                ref="jessibuca"
-                :visible.sync="showVideoDialog"
-                :video-url="videoUrl"
-                :error="videoError"
-                :message="videoError"
-                :has-audio="hasAudio"
-                fluent
-                autoplay
-                live
-              />
-            </div>
+            <jessibucaPlayer
+              style="height: 22.5vw"
+              v-if="activePlayer === 'jessibuca'"
+              ref="jessibuca"
+              :visible.sync="showVideoDialog"
+              :video-url="videoUrl"
+              :error="videoError"
+              :message="videoError"
+              :has-audio="hasAudio"
+              fluent
+              autoplay
+              live
+            />
 
           </el-tab-pane>
           <el-tab-pane label="WebRTC" name="webRTC">
@@ -351,7 +350,7 @@ export default {
   data() {
     return {
       video: 'http://lndxyj.iqilu.com/public/upload/2019/10/14/8c001ea0c09cdc59a57829dabc8010fa.mp4',
-      videoUrl: '',
+      videoUrl: null,
       activePlayer: 'jessibuca',
       // 如何你只是用一种播放器，直接注释掉不用的部分即可
       player: {
@@ -427,7 +426,6 @@ export default {
       console.log(this.player[tab.name][0])
       this.activePlayer = tab.name
       this.videoUrl = this.getUrlByStreamInfo()
-      console.log(this.videoUrl)
     },
     openDialog: function(tab, deviceId, channelId, param) {
       if (this.showVideoDialog) {
@@ -439,7 +437,7 @@ export default {
       this.streamId = ''
       this.mediaServerId = ''
       this.app = ''
-      this.videoUrl = ''
+      this.videoUrl = null
       if (this.$refs[this.activePlayer]) {
         this.$refs[this.activePlayer].pause()
       }
@@ -470,7 +468,6 @@ export default {
       this.playFromStreamInfo(false, streamInfo)
     },
     getUrlByStreamInfo() {
-      console.log(this.streamInfo)
       let streamInfo = this.streamInfo
       if (this.streamInfo.transcodeStream) {
         streamInfo = this.streamInfo.transcodeStream