Merge pull request #1455 from hexq/master

Bugfix: 解决疑似Mac 14寸下国标设备直播之Jessibuca下出现的部分黑屏问题

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 @@ export default {
   //   });
   //   ro.observe(this.$refs.container);
   // },
+  mounted(){
+    this.updatePlayerDomSize();
+  },
   watch: {
     videoUrl: {
       handler(val, _) {
@@ -91,6 +95,7 @@ export default {
       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)
       }

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>