Merge pull request #447 from hotcoffie/wvp-28181-2.0

之前播放器窗口缩放时大小很奇怪,还有黑色底色
This commit is contained in:
648540858 2022-04-23 14:20:00 +08:00 committed by GitHub
commit 24057251e2

View File

@ -1,5 +1,5 @@
<template> <template>
<div :id="containerId" :ref="containerId" style="width: 100%;height: auto; background-color: #000" @dblclick="fullscreenSwich"> <div :id="containerId" :ref="containerId" @dblclick="fullscreenSwich">
<div class="buttons-box" id="buttonsBox"> <div class="buttons-box" id="buttonsBox">
<div class="buttons-box-left"> <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-play jessibuca-btn" @click="playBtnClick"></i>
@ -9,10 +9,11 @@
<i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="jessibuca.cancelMute()"></i> <i v-if="!isNotMute" class="iconfont icon-audio-mute jessibuca-btn" @click="jessibuca.cancelMute()"></i>
</div> </div>
<div class="buttons-box-right"> <div class="buttons-box-right">
<span class="jessibuca-btn">{{kBps}} kb/s</span> <span class="jessibuca-btn">{{ kBps }} kb/s</span>
<!-- <i class="iconfont icon-file-record1 jessibuca-btn"></i>--> <!-- <i class="iconfont icon-file-record1 jessibuca-btn"></i>-->
<!-- <i class="iconfont icon-xiangqing2 jessibuca-btn" ></i>--> <!-- <i class="iconfont icon-xiangqing2 jessibuca-btn" ></i>-->
<i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="jessibuca.screenshot('截图','png',0.5)" style="font-size: 1rem !important"></i> <i class="iconfont icon-camera1196054easyiconnet jessibuca-btn" @click="jessibuca.screenshot('截图','png',0.5)"
style="font-size: 1rem !important"></i>
<i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i> <i class="iconfont icon-shuaxin11 jessibuca-btn" @click="playBtnClick"></i>
<i v-if="!fullscreen" class="iconfont icon-weibiaoti10 jessibuca-btn" @click="fullscreenSwich"></i> <i v-if="!fullscreen" class="iconfont icon-weibiaoti10 jessibuca-btn" @click="fullscreenSwich"></i>
<i v-if="fullscreen" class="iconfont icon-weibiaoti11 jessibuca-btn" @click="fullscreenSwich"></i> <i v-if="fullscreen" class="iconfont icon-weibiaoti11 jessibuca-btn" @click="fullscreenSwich"></i>
@ -43,20 +44,17 @@ export default {
forceNoOffscreen: false, forceNoOffscreen: false,
}; };
}, },
props: ['containerId','videoUrl', 'error', 'hasAudio', 'height'], props: ['containerId', 'videoUrl', 'error', 'hasAudio', 'height'],
mounted () { mounted() {
window.onerror = (msg) => { window.onerror = (msg) => {
// console.error(msg) // console.error(msg)
}; };
let paramUrl = decodeURIComponent(this.$route.params.url) let paramUrl = decodeURIComponent(this.$route.params.url)
this.$nextTick(() =>{ this.$nextTick(() => {
let dom = document.getElementById(this.containerId); this.updatePlayerDomSize()
if (dom.parentNode.clientHeight == 0) { window.onresize = () => {
dom.style.height = (9/16 ) * dom.clientWidth + "px" this.updatePlayerDomSize()
} }
dom.style.height = dom.parentNode.clientHeight + "px";
dom.style.width = dom.parentNode.clientWidth + "px";
if (typeof (this.videoUrl) == "undefined") { if (typeof (this.videoUrl) == "undefined") {
this.videoUrl = paramUrl; this.videoUrl = paramUrl;
} }
@ -65,14 +63,20 @@ export default {
this.play(this.videoUrl) this.play(this.videoUrl)
}) })
}, },
watch:{ watch: {
videoUrl(newData, oldData){ videoUrl(newData, oldData) {
this.play(newData) this.play(newData)
}, },
immediate:true immediate: true
}, },
methods: { methods: {
create(){ updatePlayerDomSize() {
let dom = document.getElementById(this.containerId);
const width = dom.parentNode.clientWidth
dom.style.width = width + 'px';
dom.style.height = (9 / 16) * width + "px";
},
create() {
let options = {}; let options = {};
console.log(this.$refs[this.containerId]) console.log(this.$refs[this.containerId])
console.log("hasAudio " + this.hasAudio) console.log("hasAudio " + this.hasAudio)
@ -82,14 +86,14 @@ export default {
container: this.$refs[this.containerId], container: this.$refs[this.containerId],
videoBuffer: 0.2, // videoBuffer: 0.2, //
isResize: true, isResize: true,
decoder:"static/js/jessibuca/decoder.js", decoder: "static/js/jessibuca/decoder.js",
useMSE: false, useMSE: false,
showBandwidth: false, showBandwidth: false,
isFlv: true, isFlv: true,
// text: "WVP-PRO", // text: "WVP-PRO",
// background: "static/images/zlm-logo.png", // background: "static/images/zlm-logo.png",
loadingText: "加载中", loadingText: "加载中",
hasAudio: typeof (this.hasAudio) =="undefined"? true: this.hasAudio, hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
debug: false, debug: false,
supportDblclickFullscreen: false, // supportDblclickFullscreen: false, //
operateBtns: { operateBtns: {
@ -200,20 +204,20 @@ export default {
}); });
}, },
resize(){ resize() {
if (this.jessibuca){ if (this.jessibuca) {
this.jessibuca.resize() this.jessibuca.resize()
this.$nextTick(() =>{ this.$nextTick(() => {
let dom = document.getElementById(this.containerId); let dom = document.getElementById(this.containerId);
if (dom.parentNode.clientHeight == 0) { if (dom.parentNode.clientHeight == 0) {
dom.style.height = (9/16 ) * dom.clientWidth + "px" dom.style.height = (9 / 16) * dom.clientWidth + "px"
} }
dom.style.height = dom.parentNode.clientHeight + "px"; dom.style.height = dom.parentNode.clientHeight + "px";
dom.style.width = dom.parentNode.clientWidth + "px"; dom.style.width = dom.parentNode.clientWidth + "px";
}) })
} }
}, },
playBtnClick: function (event){ playBtnClick: function (event) {
this.play(this.videoUrl) this.play(this.videoUrl)
}, },
play: function (url) { play: function (url) {
@ -257,17 +261,17 @@ export default {
this.performance = ""; this.performance = "";
}, },
eventcallbacK: function(type, message) { eventcallbacK: function (type, message) {
// console.log("player ") // console.log("player ")
// console.log(type) // console.log(type)
// console.log(message) // console.log(message)
}, },
fullscreenSwich: function (){ fullscreenSwich: function () {
let isFull = this.isFullscreen() let isFull = this.isFullscreen()
this.jessibuca.setFullscreen(!isFull) this.jessibuca.setFullscreen(!isFull)
this.fullscreen = !isFull; this.fullscreen = !isFull;
}, },
isFullscreen: function (){ isFullscreen: function () {
return document.fullscreenElement || return document.fullscreenElement ||
document.msFullscreenElement || document.msFullscreenElement ||
document.mozFullScreenElement || document.mozFullScreenElement ||
@ -286,7 +290,7 @@ export default {
</script> </script>
<style> <style>
.buttons-box{ .buttons-box {
width: 100%; width: 100%;
height: 28px; height: 28px;
background-color: rgba(43, 51, 63, 0.7); background-color: rgba(43, 51, 63, 0.7);
@ -298,8 +302,9 @@ export default {
bottom: 0; bottom: 0;
user-select: none; user-select: none;
z-index: 10; z-index: 10;
} }
.jessibuca-btn{
.jessibuca-btn {
width: 20px; width: 20px;
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
line-height: 27px; line-height: 27px;
@ -308,9 +313,10 @@ export default {
cursor: pointer; cursor: pointer;
text-align: center; text-align: center;
font-size: 0.8rem !important; font-size: 0.8rem !important;
} }
.buttons-box-right {
.buttons-box-right {
position: absolute; position: absolute;
right: 0; right: 0;
} }
</style> </style>