From c35932e24cf9dda9ef396ab5a45fb1a6e5539748 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 29 十月 2021 11:22:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0 --- web_src/src/components/dialog/jessibuca.vue | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web_src/src/components/dialog/jessibuca.vue b/web_src/src/components/dialog/jessibuca.vue index ff91cd1..7e9e009 100644 --- a/web_src/src/components/dialog/jessibuca.vue +++ b/web_src/src/components/dialog/jessibuca.vue @@ -13,7 +13,7 @@ <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-crop2 jessibuca-btn" @click="jessibuca.screenshot('鎴浘','png',0.5)"></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> @@ -46,7 +46,7 @@ forceNoOffscreen: false, }; }, - props: ['videoUrl', 'error', 'hasaudio', 'height'], + props: ['videoUrl', 'error', 'hasAudio', 'height'], mounted () { window.onerror = (msg) => { // console.error(msg) @@ -73,17 +73,19 @@ create(){ let options = {}; console.log(this.$refs.container) + console.log("hasAudio " + this.hasAudio) this.jessibuca = new window.Jessibuca(Object.assign( { container: this.$refs.container, videoBuffer: 0.5, // 鏈�澶х紦鍐叉椂闀匡紝鍗曚綅绉� isResize: true, + isFlv: true, decoder: "./static/js/jessibuca/index.js", // text: "WVP-PRO", // background: "bg.jpg", loadingText: "鍔犺浇涓�", - hasAudio: this.hasAudio, + hasAudio: typeof (this.hasAudio) =="undefined"? true: this.hasAudio, debug: false, supportDblclickFullscreen: false, // 鏄惁鏀寔灞忓箷鐨勫弻鍑讳簨浠讹紝瑙﹀彂鍏ㄥ睆锛屽彇娑堝叏灞忎簨浠躲�� operateBtns: { -- Gitblit v1.8.0