Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1455 from hexq/master 

Bugfix: 解决疑似Mac 14寸下国标设备直播之Jessibuca下出现的部分黑屏问题
pull/1489/head
648540858 2024-05-17 05:12:23 +08:00 committed by GitHub
parent b3eba418a2 09efdef4ce
commit 7f9c903344
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web_src/src/components/common/jessibuca.vue
View File

@ -1,6 +1,7 @@
<template> <template>
<div ref="container" @dblclick="fullscreenSwich" <div ref="container" @dblclick="fullscreenSwich"
style="width:100%; height: 100%; background-color: #000000;margin:0 auto;position: relative;"> style="width:100%; height: 100%; background-color: #000000;margin:0 auto;position: relative;">
<div style="width:100%; padding-top: 56.25%; position: relative;"></div>
<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>
@ -66,6 +67,9 @@ export default {
// }); // });
// ro.observe(this.$refs.container); // ro.observe(this.$refs.container);
// }, // },
mounted(){
this.updatePlayerDomSize();
},
watch: { watch: {
videoUrl: { videoUrl: {
handler(val, _) { handler(val, _) {
@ -91,6 +95,7 @@ export default {
if (width > 0 && height > 0) { if (width > 0 && height > 0) {
dom.style.width = width + 'px'; dom.style.width = width + 'px';
dom.style.height = height + "px"; dom.style.height = height + "px";
dom.style.paddingTop = 0;
console.log(width) console.log(width)
console.log(height) console.log(height)
} }

4
web_src/src/components/dialog/devicePlayer.vue
View File

@ -7,7 +7,7 @@
v-if="Object.keys(this.player).length > 1"> v-if="Object.keys(this.player).length > 1">
<el-tab-pane label="Jessibuca" name="jessibuca"> <el-tab-pane label="Jessibuca" name="jessibuca">
<jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog" <jessibucaPlayer v-if="activePlayer === 'jessibuca'" ref="jessibuca" :visible.sync="showVideoDialog"
:videoUrl="videoUrl" :error="videoError" :message="videoError" style="height: 515px" :videoUrl="videoUrl" :error="videoError" :message="videoError"
:hasAudio="hasAudio" fluent autoplay live></jessibucaPlayer> :hasAudio="hasAudio" fluent autoplay live></jessibucaPlayer>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="WebRTC" name="webRTC"> <el-tab-pane label="WebRTC" name="webRTC">
@ -19,7 +19,7 @@
</el-tabs> </el-tabs>
<jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca" <jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca"
:visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError"
height="100px" :hasAudio="hasAudio" fluent autoplay live></jessibucaPlayer> :hasAudio="hasAudio" fluent autoplay live></jessibucaPlayer>
<rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca" <rtc-player v-if="Object.keys(this.player).length == 1 && this.player.webRTC" ref="jessibuca"
:visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError" :visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError"
height="100px" :hasAudio="hasAudio" fluent autoplay live></rtc-player> height="100px" :hasAudio="hasAudio" fluent autoplay live></rtc-player>