From 11d927e400659307d4451158d31ff1bcbd693a24 Mon Sep 17 00:00:00 2001
From: jmal <zhushilun084@gmail.com>
Date: Sun, 20 Sep 2020 22:25:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=92=AD=E6=94=BE?=
 =?UTF-8?q?=E8=A7=86=E5=B1=8F=E6=97=B6=E4=BD=BF=E5=85=B3=E9=97=AD=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=87=AA=E5=8A=A8=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ShowFile/ShowFile.vue    |  1 -
 src/components/preview/VideoPreview.vue | 80 +++++++++++++++++++++++--
 src/views/public/share/shareList.vue    |  4 +-
 src/views/public/share/shareList_m.vue  |  7 +--
 src/websocket/sockJS.js                 |  4 --
 5 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index 4a481ad..7579764 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -885,7 +885,6 @@
             }
           }
         },ws.headers);
-        console.log("订阅",'/user/queue/update')
       },
       load () {
         this.getFileList(true)
diff --git a/src/components/preview/VideoPreview.vue b/src/components/preview/VideoPreview.vue
index c95a142..3206604 100644
--- a/src/components/preview/VideoPreview.vue
+++ b/src/components/preview/VideoPreview.vue
@@ -2,7 +2,7 @@
 <div class="preview" v-if="show">
 <van-overlay :show="show">
   <div class="wrapper">
-    <div class="block" @mouseenter="closeBarShow = true" @mouseleave="closeBarShow = false">
+    <div class="block" @mousemove="onmousemove" @mouseout="onmouseout" @mouseenter="onmouseenter" @mouseleave="onmouseleave">
 <!--      <div role="button" @click="close" class="viewer-button viewer-close" data-viewer-action="mix"></div>-->
       <div v-show="pc?closeBarShow:true" class="close-bar" @click="close">
         <svg-icon class="audio-player-close" icon-class="close"/>
@@ -10,7 +10,10 @@
       <video-player class="video-player vjs-custom-skin"
         ref="videoPlayer"
         :playsinline="true"
-        :options="playerOptions">
+        :options="playerOptions"
+        @playing="onPlayerPlaying"
+        @ended="onPlayerEnded"
+        @pause="onPlayerPause">
       </video-player>
     </div>
   </div>
@@ -81,6 +84,8 @@ export default {
                 },
         show: this.status,
         url: '',
+        timeout: null,
+        playing: false,
       }
     },
     watch: {
@@ -102,10 +107,76 @@ export default {
       }
     },
     methods: {
-      close(){
+      close() {
         this.show = false
         this.$emit('update:status', false)
-      }
+      },
+      onPlayerPlaying(){
+        this.playing = true
+        this.clearTimeout()
+        this.timeout = setTimeout(this.timeoutFun, 2500)
+      },
+      onPlayerPause(){
+        this.closeBarShow = true
+        this.playing = false
+      },
+      onPlayerEnded(){
+        this.closeBarShow = true
+        this.playing = false
+      },
+      onmousemove() {
+        if(!this.closeBarShow){
+            this.closeBarShow = true
+          }
+          this.clearTimeout()
+          this.timeout = setTimeout(this.timeoutFun, 2500)
+      },
+      onmouseout() {
+          // console.log('onmouseout')
+          // this.timeout = null
+      },
+      onmouseleave() {
+        this.closeBarShow = false
+        this.clearTimeout()
+      },
+      clearTimeout(){
+        if(this.timeout != null){
+          clearTimeout(this.timeout)
+          this.timeout = null
+        }
+      },
+      timeoutFun(){
+        if(this.playing){
+          console.log("消失",this.$pc)
+          if(!this.$pc){
+            const closeBar = document.querySelector('.block .close-bar')
+            closeBar.style.display = "none"
+          }
+          this.closeBarShow = false
+        }
+        this.clearTimeout()
+      },
+      onmouseenter() {
+        this.closeBarShow = true
+        let player = document.querySelector('.video-player.video-player.vjs-custom-skin')
+        // console.log('player',player)
+        // if(!player) return;
+        // this.onhover(function() {
+        //     console.log('124')
+        //   }, player, 2000);
+      },
+      // onhover(fun, obj, time) {
+      //   var s;
+      //   obj.onmouseover = function() {
+      //       console.log('onmouseover')
+      //       s = setTimeout(fun, 1000);
+      //     };
+      //   obj.onmouseout = function() {
+      //     console.log('onmouseout')
+      //       if(!s) return;
+      //       clearTimeout(s);
+      //     };
+      // },
     }
 }
 </script>
@@ -144,6 +215,7 @@ export default {
     border-style: solid;
     border-color: transparent transparent transparent #d4d4d475;
     line-height: 36px;
+    opacity: 1;
     transform: rotate(-45deg);
   }
 
diff --git a/src/views/public/share/shareList.vue b/src/views/public/share/shareList.vue
index 3c73fa5..ca85d85 100644
--- a/src/views/public/share/shareList.vue
+++ b/src/views/public/share/shareList.vue
@@ -36,7 +36,7 @@
     <!--右键菜单-->
     <e-vue-contextmenu ref="contextShow" class="newFileMenu" :class="menuTriangle" @ctx-show="show" @ctx-hide="hide">
       <div class="popper-arrow"></div>
-      <ul v-for="(item,index) in menus" :key="item.label">
+      <ul v-for="item in menus" :key="item.label">
         <li
           v-if="item.operation === 'unFavorite' || item.operation === 'favorite'"
           @click="menusOperations(item.operation)"
@@ -969,7 +969,7 @@
 
     .share-header-content {
       display: flex;
-      -webkit-align-items: center;
+      align-items: center;
       svg {
         font-size: 50px;
       }
diff --git a/src/views/public/share/shareList_m.vue b/src/views/public/share/shareList_m.vue
index a442c6e..c63e61b 100644
--- a/src/views/public/share/shareList_m.vue
+++ b/src/views/public/share/shareList_m.vue
@@ -33,7 +33,7 @@
     <!--右键菜单-->
     <e-vue-contextmenu ref="contextShow" class="newFileMenu" :class="menuTriangle" @ctx-show="show" @ctx-hide="hide">
       <div class="popper-arrow"></div>
-      <ul v-for="(item,index) in menus" :key="item.label">
+      <ul v-for="item in menus" :key="item.label">
         <li
           v-if="item.operation === 'unFavorite' || item.operation === 'favorite'"
           @click="menusOperations(item.operation)"
@@ -916,9 +916,6 @@
   .searchClass[data-v-92fa2b3e] {
     padding: 3px;
   }
-  .share-h {
-    //padding: 0 15px;
-  }
   .share-header {
     height: 50px;
     text-align: center;
@@ -933,7 +930,7 @@
 
     .share-header-content {
       display: flex;
-      -webkit-align-items: center;
+      align-items: center;
       svg {
         font-size: 50px;
       }
diff --git a/src/websocket/sockJS.js b/src/websocket/sockJS.js
index 064d682..b584d48 100644
--- a/src/websocket/sockJS.js
+++ b/src/websocket/sockJS.js
@@ -29,11 +29,7 @@ function connect(username,token){
   };
   // 向服务器发起websocket连接
   ws.stompClient.connect(ws.headers,() => {
-    console.log('websocket连接成功！')
     ws.isConnected = true;
-    // 订阅系统数据 '/topic/updateData/2/system'
-    // 订阅合并数据 '/topic/updateData/mergeDate/2'
-    // 订阅冷水机1号数据 /topic/updateData/2/1101/1
   }, (err) => {
     ws.isConnected = false;
     // 连接发生错误时的处理函数