From ec3f667b75c81c20049f588de6c867e4f1b45e17 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 18 Oct 2019 12:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9F=B3=E9=87=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4Bug=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=8B=96=E5=8A=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9F=B3=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                    |  2 +
 src/renderer/components/core/Player.vue | 60 +++++++++++++++++++++----
 2 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index 1621e247..d41b830c 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -3,6 +3,7 @@
 - 新增网易云源歌曲搜索
 - 新增网易云源歌单
 - 新增各平台通过输入歌单链接或歌单ID打开歌单详情列表
+- 新增音量调整滑动功能，现在支持鼠标按下左右拖动调整音量了
 
 #### 优化
 
@@ -14,3 +15,4 @@
 - 修复默认列表没有创建时无法显示收藏列表的Bug
 - 修复网易云128k直接试听
 - 修复歌曲音质不存在时仍然播放或下载的Bug
+- 修复调整音量时，调整的位置与鼠标点击的位置不一致的问题
diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 435d97ad..267f2c73 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -9,8 +9,9 @@ div(:class="$style.player")
       div(:class="$style.container")
         div(:class="$style.title" @click="handleCopy(title)" :title="title + '（点击复制）'") {{title}}
         div(:class="$style.volumeContent")
-          div(:class="$style.volume" @click.stop='handleChangeVolume' :title="`当前音量：${parseInt(volume * 100)}%`")
+          div(:class="$style.volume")
             div(:class="$style.volumeBar" :style="{ transform: `scaleX(${volume || 0})` }")
+          div(:class="$style.volumeMask" @mousedown="handleVolumeMsDown" ref="dom_volumeMask" :title="`当前音量：${parseInt(volume * 100)}%`")
 
         //- div(:class="$style.playBtn" @click='handleNext' title="音量")
           svg(version='1.1' xmlns='http://www.w3.org/2000/svg' xlink='http://www.w3.org/1999/xlink' height='100%' viewBox='0 0 291.063 291.064' space='preserve')
@@ -48,9 +49,10 @@ div(:class="$style.player")
 <script>
 import Lyric from 'lrc-file-parser'
 import { rendererSend } from '../../../common/icp'
-import { formatPlayTime2, getRandom, checkPath, setTitle, clipboardWriteText } from '../../utils'
+import { formatPlayTime2, getRandom, checkPath, setTitle, clipboardWriteText, debounce } from '../../utils'
 import { mapGetters, mapActions, mapMutations } from 'vuex'
 import { requestMsg } from '../../utils/message'
+import { isMac } from '../../../common/utils'
 
 export default {
   data() {
@@ -80,6 +82,14 @@ export default {
       delayNextTimeout: null,
       audioErrorTime: 0,
       retryNum: 0,
+      isMac,
+      volumeEvent: {
+        isMsDown: false,
+        msDownX: 0,
+        msDownVolume: 0,
+      },
+      handleVolumeMsMoveFn: null,
+      handleVolumeMsUpFn: null,
     }
   },
   computed: {
@@ -111,6 +121,16 @@ export default {
     this.$nextTick(() => {
       this.setProgessWidth()
     })
+    this.handleSaveVolume = debounce(volume => {
+      this.setVolume(volume)
+    }, 300)
+
+    document.addEventListener('mousemove', this.handleVolumeMsMoveFn = this.handleVolumeMsMove.bind(this))
+    document.addEventListener('mouseup', this.handleVolumeMsUpFn = this.handleVolumeMsUp.bind(this))
+  },
+  beforeDestroy() {
+    document.removeEventListener('mousemove', this.handleVolumeMsMoveFn)
+    document.removeEventListener('mouseup', this.handleVolumeMsUpFn)
   },
   watch: {
     changePlay(n) {
@@ -442,16 +462,29 @@ export default {
     clearAppTitle() {
       setTitle()
     },
-    handleChangeVolume(e) {
+    handleVolumeMsDown(e) {
+      this.volumeEvent.isMsDown = true
+      this.volumeEvent.isMsMoved = false
+      this.volumeEvent.msDownX = e.clientX
+
       let val = e.offsetX / 70
       if (val < 0) val = 0
       if (val > 1) val = 1
-      if (val > 0.97) val = 1
+
       this.volume = val
+      this.volumeEvent.msDownVolume = val
+      // console.log(val)
       if (this.audio) this.audio.volume = this.volume
     },
-    handleSaveVolume(volume) {
-      this.setVolume(volume)
+    handleVolumeMsUp(e) {
+      this.volumeEvent.isMsDown = false
+    },
+    handleVolumeMsMove(e) {
+      if (!this.volumeEvent.isMsDown) return
+      let val = this.volumeEvent.msDownVolume + (e.clientX - this.volumeEvent.msDownX) / 70
+      this.volume = val < 0 ? 0 : val > 1 ? 1 : val
+      if (this.audio) this.audio.volume = this.volume
+      // console.log(val)
     },
     handleCopy(text) {
       clipboardWriteText(text)
@@ -527,6 +560,7 @@ export default {
 }
 
 .volume-content {
+  position: relative;
   width: 100px;
   display: flex;
   align-items: center;
@@ -534,7 +568,7 @@ export default {
 }
 
 .volume {
-  cursor: pointer;
+  // cursor: pointer;
   width: 100%;
   height: 0.25em;
   border-radius: 10px;
@@ -564,6 +598,16 @@ export default {
   opacity: .5;
 }
 
+.volume-mask {
+  position: absolute;
+  left: 15px;
+  right: 15px;
+  top: 0;
+  width: 70%;
+  height: 100%;
+  cursor: pointer;
+}
+
 .play-btn {
   + .play-btn {
     margin-left: 10px;
@@ -576,7 +620,7 @@ export default {
   transition: @transition-theme;
   transition-property: color;
   color: @color-theme;
-  transition: opacity 0.2s ease;
+  transition: opacity 0.1s ease;
   opacity: 1;
   cursor: pointer;