From a580ff6fbd03e94a043300f3ee65faa8fdab7c65 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 八月 2022 09:28:46 +0800
Subject: [PATCH] Merge pull request #568 from zouyaoji/wvp-28181-2.0
---
web_src/src/components/common/jessibuca.vue | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/web_src/src/components/common/jessibuca.vue b/web_src/src/components/common/jessibuca.vue
index 2701a22..4049721 100644
--- a/web_src/src/components/common/jessibuca.vue
+++ b/web_src/src/components/common/jessibuca.vue
@@ -5,8 +5,8 @@
<i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
<i v-if="playing" class="iconfont icon-pause jessibuca-btn" @click="pause"></i>
<i class="iconfont icon-stop jessibuca-btn" @click="destroy"></i>
- <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="jessibuca.mute()"></i>
- <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="jessibuca.cancelMute()"></i>
+ <i v-if="isNotMute" class="iconfont icon-audio-high jessibuca-btn" @click="mute()"></i>
+ <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="cancelMute()"></i>
</div>
<div class="buttons-box-right">
<span class="jessibuca-btn">{{ kBps }} kb/s</span>
@@ -23,7 +23,7 @@
</template>
<script>
-let jessibuca = null;
+let jessibucaPlayer = {};
export default {
name: 'jessibuca',
data() {
@@ -49,6 +49,7 @@
window.onerror = (msg) => {
// console.error(msg)
};
+ console.log(this._uid)
let paramUrl = decodeURIComponent(this.$route.params.url)
this.$nextTick(() => {
this.updatePlayerDomSize()
@@ -88,7 +89,7 @@
let options = {};
console.log("hasAudio " + this.hasAudio)
- jessibuca = new window.Jessibuca(Object.assign(
+ jessibucaPlayer[this._uid] = new window.Jessibuca(Object.assign(
{
container: this.$refs.container,
videoBuffer: 0.2, // 鏈�澶х紦鍐叉椂闀匡紝鍗曚綅绉�
@@ -117,7 +118,7 @@
},
options
));
-
+ let jessibuca = jessibucaPlayer[this._uid];
let _this = this;
jessibuca.on("load", function () {
console.log("on load init");
@@ -216,40 +217,50 @@
},
play: function (url) {
console.log(url)
- if (jessibuca) {
+ if (jessibucaPlayer[this._uid]) {
this.destroy();
}
this.create();
- jessibuca.on("play", () => {
+ jessibucaPlayer[this._uid].on("play", () => {
this.playing = true;
this.loaded = true;
this.quieting = jessibuca.quieting;
});
- if (jessibuca.hasLoaded()) {
- jessibuca.play(url);
+ if (jessibucaPlayer[this._uid].hasLoaded()) {
+ jessibucaPlayer[this._uid].play(url);
} else {
- jessibuca.on("load", () => {
+ jessibucaPlayer[this._uid].on("load", () => {
console.log("load 鎾斁")
- jessibuca.play(url);
+ jessibucaPlayer[this._uid].play(url);
});
}
},
pause: function () {
- if (jessibuca) {
- jessibuca.pause();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].pause();
}
this.playing = false;
this.err = "";
this.performance = "";
},
+ mute: function () {
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].mute();
+ }
+ },
+ cancelMute: function () {
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].cancelMute();
+ }
+ },
destroy: function () {
- if (jessibuca) {
- jessibuca.destroy();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].destroy();
}
if (document.getElementById("buttonsBox") == null) {
this.$refs.container.appendChild(this.btnDom)
}
- jessibuca = null;
+ jessibucaPlayer[this._uid] = null;
this.playing = false;
this.err = "";
this.performance = "";
@@ -262,7 +273,7 @@
},
fullscreenSwich: function () {
let isFull = this.isFullscreen()
- jessibuca.setFullscreen(!isFull)
+ jessibucaPlayer[this._uid].setFullscreen(!isFull)
this.fullscreen = !isFull;
},
isFullscreen: function () {
@@ -273,8 +284,8 @@
}
},
destroyed() {
- if (jessibuca) {
- jessibuca.destroy();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].destroy();
}
this.playing = false;
this.loaded = false;
--
Gitblit v1.8.0