From b0d0d30781a99e53f1a287cdb076da6871085029 Mon Sep 17 00:00:00 2001
From: XiaoQiTong <69035114+XiaoQiTong@users.noreply.github.com>
Date: 星期二, 18 十月 2022 20:18:51 +0800
Subject: [PATCH] 修改云端录像选择节点流媒体path不修改的bug device表增加的mediaServerId字段丢失，重新添加
---
web_src/src/components/common/jessibuca.vue | 130 ++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 63 deletions(-)
diff --git a/web_src/src/components/common/jessibuca.vue b/web_src/src/components/common/jessibuca.vue
index 3754a08..4049721 100644
--- a/web_src/src/components/common/jessibuca.vue
+++ b/web_src/src/components/common/jessibuca.vue
@@ -1,13 +1,12 @@
<template>
- <div :id="containerId" :ref="containerId" style="width: 100%;height: auto; background-color: #000"
- @dblclick="fullscreenSwich">
+ <div ref="container" @dblclick="fullscreenSwich" style="width:100%;height:100%;background-color: #000000;margin:0 auto;">
<div class="buttons-box" id="buttonsBox">
<div class="buttons-box-left">
<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>
@@ -24,11 +23,11 @@
</template>
<script>
+let jessibucaPlayer = {};
export default {
name: 'jessibuca',
data() {
return {
- jessibuca: null,
playing: false,
isNotMute: false,
quieting: false,
@@ -45,11 +44,12 @@
forceNoOffscreen: false,
};
},
- props: ['containerId', 'videoUrl', 'error', 'hasAudio', 'height'],
+ props: ['videoUrl', 'error', 'hasAudio', 'height'],
mounted() {
window.onerror = (msg) => {
// console.error(msg)
};
+ console.log(this._uid)
let paramUrl = decodeURIComponent(this.$route.params.url)
this.$nextTick(() => {
this.updatePlayerDomSize()
@@ -72,19 +72,26 @@
},
methods: {
updatePlayerDomSize() {
- let dom = document.getElementById(this.containerId);
- const width = dom.parentNode.clientWidth
+ let dom = this.$refs.container;
+ let width = dom.parentNode.clientWidth
+ let height = (9 / 16) * width
+
+ const clientHeight = Math.min(document.body.clientHeight, document.documentElement.clientHeight)
+ if (height > clientHeight) {
+ height = clientHeight
+ width = (16 / 9) * height
+ }
+
dom.style.width = width + 'px';
- dom.style.height = (9 / 16) * width + "px";
+ dom.style.height = height + "px";
},
create() {
let options = {};
- console.log(this.$refs[this.containerId])
console.log("hasAudio " + this.hasAudio)
- this.jessibuca = new window.Jessibuca(Object.assign(
+ jessibucaPlayer[this._uid] = new window.Jessibuca(Object.assign(
{
- container: this.$refs[this.containerId],
+ container: this.$refs.container,
videoBuffer: 0.2, // 鏈�澶х紦鍐叉椂闀匡紝鍗曚綅绉�
isResize: true,
decoder: "static/js/jessibuca/decoder.js",
@@ -111,70 +118,70 @@
},
options
));
-
+ let jessibuca = jessibucaPlayer[this._uid];
let _this = this;
- this.jessibuca.on("load", function () {
+ jessibuca.on("load", function () {
console.log("on load init");
});
- this.jessibuca.on("log", function (msg) {
+ jessibuca.on("log", function (msg) {
console.log("on log", msg);
});
- this.jessibuca.on("record", function (msg) {
+ jessibuca.on("record", function (msg) {
console.log("on record:", msg);
});
- this.jessibuca.on("pause", function () {
+ jessibuca.on("pause", function () {
_this.playing = false;
});
- this.jessibuca.on("play", function () {
+ jessibuca.on("play", function () {
_this.playing = true;
});
- this.jessibuca.on("fullscreen", function (msg) {
+ jessibuca.on("fullscreen", function (msg) {
console.log("on fullscreen", msg);
_this.fullscreen = msg
});
- this.jessibuca.on("mute", function (msg) {
+ jessibuca.on("mute", function (msg) {
console.log("on mute", msg);
_this.isNotMute = !msg;
});
- this.jessibuca.on("audioInfo", function (msg) {
+ jessibuca.on("audioInfo", function (msg) {
// console.log("audioInfo", msg);
});
- this.jessibuca.on("videoInfo", function (msg) {
+ jessibuca.on("videoInfo", function (msg) {
// this.videoInfo = msg;
console.log("videoInfo", msg);
});
- this.jessibuca.on("bps", function (bps) {
+ jessibuca.on("bps", function (bps) {
// console.log('bps', bps);
});
let _ts = 0;
- this.jessibuca.on("timeUpdate", function (ts) {
+ jessibuca.on("timeUpdate", function (ts) {
// console.log('timeUpdate,old,new,timestamp', _ts, ts, ts - _ts);
_ts = ts;
});
- this.jessibuca.on("videoInfo", function (info) {
+ jessibuca.on("videoInfo", function (info) {
console.log("videoInfo", info);
});
- this.jessibuca.on("error", function (error) {
+ jessibuca.on("error", function (error) {
console.log("error", error);
});
- this.jessibuca.on("timeout", function () {
+ jessibuca.on("timeout", function () {
console.log("timeout");
});
- this.jessibuca.on('start', function () {
+ jessibuca.on('start', function () {
console.log('start');
})
- this.jessibuca.on("performance", function (performance) {
+ jessibuca.on("performance", function (performance) {
let show = "鍗￠】";
if (performance === 2) {
show = "闈炲父娴佺晠";
@@ -183,80 +190,77 @@
}
_this.performance = show;
});
- this.jessibuca.on('buffer', function (buffer) {
+ jessibuca.on('buffer', function (buffer) {
// console.log('buffer', buffer);
})
- this.jessibuca.on('stats', function (stats) {
+ jessibuca.on('stats', function (stats) {
// console.log('stats', stats);
})
- this.jessibuca.on('kBps', function (kBps) {
+ jessibuca.on('kBps', function (kBps) {
_this.kBps = Math.round(kBps);
});
// 鏄剧ず鏃堕棿鎴� PTS
- this.jessibuca.on('videoFrame', function () {
+ jessibuca.on('videoFrame', function () {
})
//
- this.jessibuca.on('metadata', function () {
+ jessibuca.on('metadata', function () {
});
- },
- resize() {
- if (this.jessibuca) {
- this.jessibuca.resize()
- this.$nextTick(() => {
- let dom = document.getElementById(this.containerId);
- if (dom.parentNode.clientHeight == 0) {
- dom.style.height = (9 / 16) * dom.clientWidth + "px"
- }
- dom.style.height = dom.parentNode.clientHeight + "px";
- dom.style.width = dom.parentNode.clientWidth + "px";
- })
- }
},
playBtnClick: function (event) {
this.play(this.videoUrl)
},
play: function (url) {
console.log(url)
- if (this.jessibuca) {
+ if (jessibucaPlayer[this._uid]) {
this.destroy();
}
this.create();
- this.jessibuca.on("play", () => {
+ jessibucaPlayer[this._uid].on("play", () => {
this.playing = true;
this.loaded = true;
- this.quieting = this.jessibuca.quieting;
+ this.quieting = jessibuca.quieting;
});
- if (this.jessibuca.hasLoaded()) {
- this.jessibuca.play(url);
+ if (jessibucaPlayer[this._uid].hasLoaded()) {
+ jessibucaPlayer[this._uid].play(url);
} else {
- this.jessibuca.on("load", () => {
+ jessibucaPlayer[this._uid].on("load", () => {
console.log("load 鎾斁")
- this.jessibuca.play(url);
+ jessibucaPlayer[this._uid].play(url);
});
}
},
pause: function () {
- if (this.jessibuca) {
- this.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 (this.jessibuca) {
- this.jessibuca.destroy();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].destroy();
}
if (document.getElementById("buttonsBox") == null) {
- document.getElementById("container").appendChild(this.btnDom)
+ this.$refs.container.appendChild(this.btnDom)
}
- this.jessibuca = null;
+ jessibucaPlayer[this._uid] = null;
this.playing = false;
this.err = "";
this.performance = "";
@@ -269,7 +273,7 @@
},
fullscreenSwich: function () {
let isFull = this.isFullscreen()
- this.jessibuca.setFullscreen(!isFull)
+ jessibucaPlayer[this._uid].setFullscreen(!isFull)
this.fullscreen = !isFull;
},
isFullscreen: function () {
@@ -280,8 +284,8 @@
}
},
destroyed() {
- if (this.jessibuca) {
- this.jessibuca.destroy();
+ if (jessibucaPlayer[this._uid]) {
+ jessibucaPlayer[this._uid].destroy();
}
this.playing = false;
this.loaded = false;
--
Gitblit v1.8.0