From 7f9c90334475a325ec07e806bbfa5fa7fe08678a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 17 五月 2024 05:12:23 +0800
Subject: [PATCH] Merge pull request #1455 from hexq/master
---
web_src/src/components/dialog/devicePlayer.vue | 4 ++--
web_src/src/components/common/jessibuca.vue | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/web_src/src/components/common/jessibuca.vue b/web_src/src/components/common/jessibuca.vue
index afd4222..4ea732c 100755
--- a/web_src/src/components/common/jessibuca.vue
+++ b/web_src/src/components/common/jessibuca.vue
@@ -1,6 +1,7 @@
<template>
<div ref="container" @dblclick="fullscreenSwich"
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-left">
<i v-if="!playing" class="iconfont icon-play jessibuca-btn" @click="playBtnClick"></i>
@@ -66,6 +67,9 @@
// });
// ro.observe(this.$refs.container);
// },
+ mounted(){
+ this.updatePlayerDomSize();
+ },
watch: {
videoUrl: {
handler(val, _) {
@@ -91,6 +95,7 @@
if (width > 0 && height > 0) {
dom.style.width = width + 'px';
dom.style.height = height + "px";
+ dom.style.paddingTop = 0;
console.log(width)
console.log(height)
}
diff --git a/web_src/src/components/dialog/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
index f6bd2b2..1c9705b 100755
--- a/web_src/src/components/dialog/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -7,7 +7,7 @@
v-if="Object.keys(this.player).length > 1">
<el-tab-pane label="Jessibuca" name="jessibuca">
<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>
</el-tab-pane>
<el-tab-pane label="WebRTC" name="webRTC">
@@ -19,7 +19,7 @@
</el-tabs>
<jessibucaPlayer v-if="Object.keys(this.player).length == 1 && this.player.jessibuca" ref="jessibuca"
: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"
:visible.sync="showVideoDialog" :videoUrl="videoUrl" :error="videoError" :message="videoError"
height="100px" :hasAudio="hasAudio" fluent autoplay live></rtc-player>
--
Gitblit v1.8.0