From 336b40a1025919816004f54ec83e233847bb72a7 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sat, 15 May 2021 17:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dwy=E6=BA=90=E7=9A=84=E6=AD=8C?=
 =?UTF-8?q?=E6=9B=B2=E9=9F=B3=E8=B4=A8=E5=8C=B9=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                       |  1 +
 src/renderer/store/modules/player.js       | 10 +++++-----
 src/renderer/utils/music/wy/musicDetail.js |  3 ++-
 src/renderer/utils/music/wy/musicSearch.js |  8 +++++---
 src/renderer/utils/music/wy/songList.js    |  1 +
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index db2a6970..b65e6323 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -4,3 +4,4 @@
 - 修复快捷键设置框内的提示问题
 - 修复在当前正常播放的列表中使用稍后播放功能时，播放完后稍后播放的歌曲后不会恢复原来播放位置播放的问题
 - 修复kw部分歌单无法打开的问题
+- 修复wy源的歌曲音质匹配问题
diff --git a/src/renderer/store/modules/player.js b/src/renderer/store/modules/player.js
index 2d7553b9..60b4540a 100644
--- a/src/renderer/store/modules/player.js
+++ b/src/renderer/store/modules/player.js
@@ -191,12 +191,12 @@ const getters = {
 // actions
 const actions = {
   async getUrl({ commit, state }, { musicInfo, type, isRefresh, onToggleSource = () => {} }) {
-    if (!musicInfo._types[type]) {
-      // 兼容旧版酷我源搜索列表过滤128k音质的bug
-      if (!(musicInfo.source == 'kw' && type == '128k')) throw new Error('该歌曲没有可播放的音频')
+    // if (!musicInfo._types[type]) {
+    //   // 兼容旧版酷我源搜索列表过滤128k音质的bug
+    //   if (!(musicInfo.source == 'kw' && type == '128k')) throw new Error('该歌曲没有可播放的音频')
 
-      // return Promise.reject(new Error('该歌曲没有可播放的音频'))
-    }
+    //   // return Promise.reject(new Error('该歌曲没有可播放的音频'))
+    // }
     const cachedUrl = await getStoreMusicUrl(musicInfo, type)
     if (cachedUrl && !isRefresh) return cachedUrl
 
diff --git a/src/renderer/utils/music/wy/musicDetail.js b/src/renderer/utils/music/wy/musicDetail.js
index a53d99b5..e5aafe42 100644
--- a/src/renderer/utils/music/wy/musicDetail.js
+++ b/src/renderer/utils/music/wy/musicDetail.js
@@ -13,7 +13,7 @@ export default {
     return arr.join('、')
   },
   filterList({ songs, privileges }) {
-    // console.log(tracks, privileges)
+    // console.log(songs, privileges)
     const list = []
     songs.forEach((item, index) => {
       const types = []
@@ -38,6 +38,7 @@ export default {
               size,
             }
           }
+        case 192000:
         case 128000:
           if (item.l) {
             size = sizeFormate(item.l.size)
diff --git a/src/renderer/utils/music/wy/musicSearch.js b/src/renderer/utils/music/wy/musicSearch.js
index 4fdf8558..b17a2fbe 100644
--- a/src/renderer/utils/music/wy/musicSearch.js
+++ b/src/renderer/utils/music/wy/musicSearch.js
@@ -24,8 +24,9 @@ export default {
         offset: limit * (page - 1),
       }),
     })
-    return searchRequest.promise.then(({ body }) =>
-      body && body.code === 200
+    return searchRequest.promise.then(({ body }) => {
+      // console.log(body)
+      return body && body.code === 200
         ? musicDetailApi.getList(body.result.songs.map(s => s.id)).then(({ list }) => {
           this.total = body.result.songCount || 0
           this.page = page
@@ -41,7 +42,8 @@ export default {
             },
           }
         })
-        : body)
+        : body
+    })
   },
   getSinger(singers) {
     let arr = []
diff --git a/src/renderer/utils/music/wy/songList.js b/src/renderer/utils/music/wy/songList.js
index 45f7b769..18b32626 100644
--- a/src/renderer/utils/music/wy/songList.js
+++ b/src/renderer/utils/music/wy/songList.js
@@ -139,6 +139,7 @@ export default {
               size,
             }
           }
+        case 192000:
         case 128000:
           if (item.l) {
             size = sizeFormate(item.l.size)