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

之前播放器窗口缩放时大小很奇怪，还有黑色底色

web_src/src/components/common/jessibuca.vue

@@ -1,5 +1,5 @@
 <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-left">
         <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>
       </div>
       <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-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 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>
@@ -23,294 +24,299 @@
 
 <script>
 export default {
-    name: 'jessibuca',
-    data() {
-        return {
-          jessibuca: null,
-          playing: false,
-          isNotMute: false,
-          quieting: false,
-          fullscreen: false,
-          loaded: false, // mute
-          speed: 0,
-          performance: "", // 工作情况
-          kBps: 0,
-          btnDom: null,
-          videoInfo: null,
-          volume: 1,
-          rotate: 0,
-          vod: true, // 点播
-          forceNoOffscreen: false,
-        };
-    },
-    props: ['containerId','videoUrl', 'error', 'hasAudio', 'height'],
-    mounted () {
-      window.onerror = (msg) => {
-        // console.error(msg)
-      };
-      let paramUrl = decodeURIComponent(this.$route.params.url)
-       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";
-
-          if (typeof (this.videoUrl) == "undefined") {
-            this.videoUrl = paramUrl;
-          }
-         this.btnDom = document.getElementById("buttonsBox");
-          console.log("初始化时的地址为: " + this.videoUrl)
-         this.play(this.videoUrl)
-        })
+  name: 'jessibuca',
+  data() {
+    return {
+      jessibuca: null,
+      playing: false,
+      isNotMute: false,
+      quieting: false,
+      fullscreen: false,
+      loaded: false, // mute
+      speed: 0,
+      performance: "", // 工作情况
+      kBps: 0,
+      btnDom: null,
+      videoInfo: null,
+      volume: 1,
+      rotate: 0,
+      vod: true, // 点播
+      forceNoOffscreen: false,
+    };
+  },
+  props: ['containerId', 'videoUrl', 'error', 'hasAudio', 'height'],
+  mounted() {
+    window.onerror = (msg) => {
+      // console.error(msg)
+    };
+    let paramUrl = decodeURIComponent(this.$route.params.url)
+    this.$nextTick(() => {
+      this.updatePlayerDomSize()
+      window.onresize = () => {
+        this.updatePlayerDomSize()
+      }
+      if (typeof (this.videoUrl) == "undefined") {
+        this.videoUrl = paramUrl;
+      }
+      this.btnDom = document.getElementById("buttonsBox");
+      console.log("初始化时的地址为: " + this.videoUrl)
+      this.play(this.videoUrl)
+    })
+  },
+  watch: {
+    videoUrl(newData, oldData) {
+      this.play(newData)
     },
-    watch:{
-        videoUrl(newData, oldData){
-            this.play(newData)
-        },
-        immediate:true
+    immediate: true
+  },
+  methods: {
+    updatePlayerDomSize() {
+      let dom = document.getElementById(this.containerId);
+      const width = dom.parentNode.clientWidth
+      dom.style.width = width + 'px';
+      dom.style.height = (9 / 16) * width + "px";
     },
-    methods: {
-        create(){
-          let options =  {};
-          console.log(this.$refs[this.containerId])
-          console.log("hasAudio  " + this.hasAudio)
+    create() {
+      let options = {};
+      console.log(this.$refs[this.containerId])
+      console.log("hasAudio  " + this.hasAudio)
 
-          this.jessibuca = new window.Jessibuca(Object.assign(
-            {
-              container: this.$refs[this.containerId],
-              videoBuffer: 0.2, // 最大缓冲时长，单位秒
-              isResize: true,
-              decoder:"static/js/jessibuca/decoder.js",
-              useMSE: false,
-              showBandwidth: false,
-              isFlv: true,
-              // text: "WVP-PRO",
-              // background: "static/images/zlm-logo.png",
-              loadingText: "加载中",
-              hasAudio: typeof (this.hasAudio) =="undefined"? true: this.hasAudio,
-              debug: false,
-              supportDblclickFullscreen: false, // 是否支持屏幕的双击事件，触发全屏，取消全屏事件。
-              operateBtns: {
-                fullscreen: false,
-                screenshot: false,
-                play: false,
-                audio: false,
-                recorder: false,
-              },
-              record: "record",
-              vod: this.vod,
-              forceNoOffscreen: this.forceNoOffscreen,
-              isNotMute: this.isNotMute,
-            },
-            options
-          ));
+      this.jessibuca = new window.Jessibuca(Object.assign(
+        {
+          container: this.$refs[this.containerId],
+          videoBuffer: 0.2, // 最大缓冲时长，单位秒
+          isResize: true,
+          decoder: "static/js/jessibuca/decoder.js",
+          useMSE: false,
+          showBandwidth: false,
+          isFlv: true,
+          // text: "WVP-PRO",
+          // background: "static/images/zlm-logo.png",
+          loadingText: "加载中",
+          hasAudio: typeof (this.hasAudio) == "undefined" ? true : this.hasAudio,
+          debug: false,
+          supportDblclickFullscreen: false, // 是否支持屏幕的双击事件，触发全屏，取消全屏事件。
+          operateBtns: {
+            fullscreen: false,
+            screenshot: false,
+            play: false,
+            audio: false,
+            recorder: false,
+          },
+          record: "record",
+          vod: this.vod,
+          forceNoOffscreen: this.forceNoOffscreen,
+          isNotMute: this.isNotMute,
+        },
+        options
+      ));
 
-          let _this = this;
-          this.jessibuca.on("load", function () {
-            console.log("on load init");
-          });
+      let _this = this;
+      this.jessibuca.on("load", function () {
+        console.log("on load init");
+      });
 
-          this.jessibuca.on("log", function (msg) {
-            console.log("on log", msg);
-          });
-          this.jessibuca.on("record", function (msg) {
-            console.log("on record:", msg);
-          });
-          this.jessibuca.on("pause", function () {
-            _this.playing = false;
-          });
-          this.jessibuca.on("play", function () {
-            _this.playing = true;
-          });
-          this.jessibuca.on("fullscreen", function (msg) {
-            console.log("on fullscreen", msg);
-            _this.fullscreen = msg
-          });
+      this.jessibuca.on("log", function (msg) {
+        console.log("on log", msg);
+      });
+      this.jessibuca.on("record", function (msg) {
+        console.log("on record:", msg);
+      });
+      this.jessibuca.on("pause", function () {
+        _this.playing = false;
+      });
+      this.jessibuca.on("play", function () {
+        _this.playing = true;
+      });
+      this.jessibuca.on("fullscreen", function (msg) {
+        console.log("on fullscreen", msg);
+        _this.fullscreen = msg
+      });
 
-          this.jessibuca.on("mute", function (msg) {
-            console.log("on mute", msg);
-            _this.isNotMute = !msg;
-          });
-          this.jessibuca.on("audioInfo", function (msg) {
-            // console.log("audioInfo", msg);
-          });
+      this.jessibuca.on("mute", function (msg) {
+        console.log("on mute", msg);
+        _this.isNotMute = !msg;
+      });
+      this.jessibuca.on("audioInfo", function (msg) {
+        // console.log("audioInfo", msg);
+      });
 
-          this.jessibuca.on("videoInfo", function (msg) {
-            // this.videoInfo = msg;
-            console.log("videoInfo", msg);
+      this.jessibuca.on("videoInfo", function (msg) {
+        // this.videoInfo = msg;
+        console.log("videoInfo", msg);
 
-          });
+      });
 
-          this.jessibuca.on("bps", function (bps) {
-            // console.log('bps', bps);
+      this.jessibuca.on("bps", function (bps) {
+        // console.log('bps', bps);
 
-          });
-          let _ts = 0;
-          this.jessibuca.on("timeUpdate", function (ts) {
-            // console.log('timeUpdate,old,new,timestamp', _ts, ts, ts - _ts);
-            _ts = ts;
-          });
+      });
+      let _ts = 0;
+      this.jessibuca.on("timeUpdate", function (ts) {
+        // console.log('timeUpdate,old,new,timestamp', _ts, ts, ts - _ts);
+        _ts = ts;
+      });
 
-          this.jessibuca.on("videoInfo", function (info) {
-            console.log("videoInfo", info);
-          });
+      this.jessibuca.on("videoInfo", function (info) {
+        console.log("videoInfo", info);
+      });
 
-          this.jessibuca.on("error", function (error) {
-            console.log("error", error);
-          });
+      this.jessibuca.on("error", function (error) {
+        console.log("error", error);
+      });
 
-          this.jessibuca.on("timeout", function () {
-            console.log("timeout");
-          });
+      this.jessibuca.on("timeout", function () {
+        console.log("timeout");
+      });
 
-          this.jessibuca.on('start', function () {
-            console.log('start');
-          })
+      this.jessibuca.on('start', function () {
+        console.log('start');
+      })
 
-          this.jessibuca.on("performance", function (performance) {
-            let show = "卡顿";
-            if (performance === 2) {
-              show = "非常流畅";
-            } else if (performance === 1) {
-              show = "流畅";
-            }
-            _this.performance = show;
-          });
-          this.jessibuca.on('buffer', function (buffer) {
-            // console.log('buffer', buffer);
-          })
+      this.jessibuca.on("performance", function (performance) {
+        let show = "卡顿";
+        if (performance === 2) {
+          show = "非常流畅";
+        } else if (performance === 1) {
+          show = "流畅";
+        }
+        _this.performance = show;
+      });
+      this.jessibuca.on('buffer', function (buffer) {
+        // console.log('buffer', buffer);
+      })
 
-          this.jessibuca.on('stats', function (stats) {
-            // console.log('stats', stats);
-          })
+      this.jessibuca.on('stats', function (stats) {
+        // console.log('stats', stats);
+      })
 
-          this.jessibuca.on('kBps', function (kBps) {
-            _this.kBps = Math.round(kBps);
-          });
+      this.jessibuca.on('kBps', function (kBps) {
+        _this.kBps = Math.round(kBps);
+      });
 
-          // 显示时间戳 PTS
-          this.jessibuca.on('videoFrame', function () {
+      // 显示时间戳 PTS
+      this.jessibuca.on('videoFrame', function () {
 
-          })
+      })
 
-          //
-          this.jessibuca.on('metadata', function () {
+      //
+      this.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) {
-              this.destroy();
-            }
-            this.create();
-            this.jessibuca.on("play", () => {
-              this.playing = true;
-              this.loaded = true;
-              this.quieting = this.jessibuca.quieting;
-            });
-            if (this.jessibuca.hasLoaded()) {
-              this.jessibuca.play(url);
-            } else {
-              this.jessibuca.on("load", () => {
-                console.log("load 播放")
-                this.jessibuca.play(url);
-              });
-            }
-        },
-        pause: function () {
-          if (this.jessibuca) {
-            this.jessibuca.pause();
-          }
-          this.playing = false;
-          this.err = "";
-          this.performance = "";
-        },
-        destroy: function () {
-          if (this.jessibuca) {
-            this.jessibuca.destroy();
-          }
-          if (document.getElementById("buttonsBox") == null) {
-            document.getElementById("container").appendChild(this.btnDom)
+      });
+    },
+    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"
           }
-          this.jessibuca = null;
-          this.playing = false;
-          this.err = "";
-          this.performance = "";
-
-        },
-        eventcallbacK: function(type, message) {
-            // console.log("player 事件回调")
-            // console.log(type)
-            // console.log(message)
-        },
-        fullscreenSwich: function (){
-            let isFull = this.isFullscreen()
-            this.jessibuca.setFullscreen(!isFull)
-            this.fullscreen = !isFull;
-        },
-        isFullscreen: function (){
-          return document.fullscreenElement ||
-            document.msFullscreenElement  ||
-            document.mozFullScreenElement ||
-            document.webkitFullscreenElement || false;
-        }
+          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) {
+        this.destroy();
+      }
+      this.create();
+      this.jessibuca.on("play", () => {
+        this.playing = true;
+        this.loaded = true;
+        this.quieting = this.jessibuca.quieting;
+      });
+      if (this.jessibuca.hasLoaded()) {
+        this.jessibuca.play(url);
+      } else {
+        this.jessibuca.on("load", () => {
+          console.log("load 播放")
+          this.jessibuca.play(url);
+        });
+      }
+    },
+    pause: function () {
+      if (this.jessibuca) {
+        this.jessibuca.pause();
+      }
+      this.playing = false;
+      this.err = "";
+      this.performance = "";
     },
-    destroyed() {
+    destroy: function () {
       if (this.jessibuca) {
         this.jessibuca.destroy();
       }
+      if (document.getElementById("buttonsBox") == null) {
+        document.getElementById("container").appendChild(this.btnDom)
+      }
+      this.jessibuca = null;
       this.playing = false;
-      this.loaded = false;
+      this.err = "";
       this.performance = "";
+
+    },
+    eventcallbacK: function (type, message) {
+      // console.log("player 事件回调")
+      // console.log(type)
+      // console.log(message)
+    },
+    fullscreenSwich: function () {
+      let isFull = this.isFullscreen()
+      this.jessibuca.setFullscreen(!isFull)
+      this.fullscreen = !isFull;
     },
+    isFullscreen: function () {
+      return document.fullscreenElement ||
+        document.msFullscreenElement ||
+        document.mozFullScreenElement ||
+        document.webkitFullscreenElement || false;
+    }
+  },
+  destroyed() {
+    if (this.jessibuca) {
+      this.jessibuca.destroy();
+    }
+    this.playing = false;
+    this.loaded = false;
+    this.performance = "";
+  },
 }
 </script>
 
 <style>
-  .buttons-box{
-    width: 100%;
-    height: 28px;
-    background-color: rgba(43, 51, 63, 0.7);
-    position: absolute;
-    display: -webkit-box;
-    display: -ms-flexbox;
-    display: flex;
-    left: 0;
-    bottom: 0;
-    user-select: none;
-    z-index: 10;
-  }
-  .jessibuca-btn{
-    width: 20px;
-    color: rgb(255, 255, 255);
-    line-height: 27px;
-    margin: 0px 10px;
-    padding: 0px 2px;
-    cursor: pointer;
-    text-align: center;
-    font-size: 0.8rem !important;
-  }
-  .buttons-box-right {
-    position: absolute;
-    right: 0;
-  }
+.buttons-box {
+  width: 100%;
+  height: 28px;
+  background-color: rgba(43, 51, 63, 0.7);
+  position: absolute;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  left: 0;
+  bottom: 0;
+  user-select: none;
+  z-index: 10;
+}
+
+.jessibuca-btn {
+  width: 20px;
+  color: rgb(255, 255, 255);
+  line-height: 27px;
+  margin: 0px 10px;
+  padding: 0px 2px;
+  cursor: pointer;
+  text-align: center;
+  font-size: 0.8rem !important;
+}
+
+.buttons-box-right {
+  position: absolute;
+  right: 0;
+}
 </style>