Merge branch 'dev'

CHANGELOG.md

@@ -6,6 +6,12 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [1.8.2](https://github.com/lyswhut/lx-music-desktop/compare/v1.8.1...v1.8.2) - 2021-03-09
+
+### 修复
+
+- 修复歌曲ID存储变更导致酷狗图片获取失败的问题
+
 ## [1.8.1](https://github.com/lyswhut/lx-music-desktop/compare/v1.8.0...v1.8.1) - 2021-03-07
 
 ### 修复

README.md

@@ -86,9 +86,9 @@ npm run pack:linux
 - `-play` 启动时播放指定列表的音乐，参数说明：
   - `type`：播放类型，目前固定为`songList`
   - `source`：播放源，可用值为`kw/kg/tx/wy/mg/myList`，其中`kw/kg/tx/wy/mg`对应各源的在线列表，`myList`为本地列表
-  - `link`：要播放的在线列表歌单链接、或ID，source为`kw/kg/tx/wy/mg`之一（在线列表）时必传，举例：`./lx-music-desktop -play="type=songList&source=kw&link=歌单URL or ID"，注意：如果传入URL时必须对URL进行编码后再传入
-  - `name`：要播放的本地列表歌单名字，source为`myList`时必传，举例：`./lx-music-desktop -play="type=songList&source=myList&name=默认列表"
-  - `index`：从列表的哪个位置开始播放，选传，若不传默认播放第一首歌曲，举例：`./lx-music-desktop -play="type=songList&source=myList&name=默认列表&index=2"
+  - `link`：要播放的在线列表歌单链接、或ID，source为`kw/kg/tx/wy/mg`之一（在线列表）时必传，举例：`./lx-music-desktop -play="type=songList&source=kw&link=歌单URL or ID"`，注意：如果传入URL时必须对URL进行编码后再传入
+  - `name`：要播放的本地列表歌单名字，source为`myList`时必传，举例：`./lx-music-desktop -play="type=songList&source=myList&name=默认列表"`
+  - `index`：从列表的哪个位置开始播放，选传，若不传默认播放第一首歌曲，举例：`./lx-music-desktop -play="type=songList&source=myList&name=默认列表&index=2"`
 
 ### 常见问题
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "1.8.1",
+  "version": "1.8.2",
   "description": "一个免费的音乐查找助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",

publish/changeLog.md

@@ -1,3 +1,3 @@
 ### 修复
 
-- 修复歌词翻译的主题颜色适配问题
+- 修复歌曲ID存储变更导致酷狗图片获取失败的问题

src/renderer/utils/music/kg/comment.js

@@ -31,9 +31,13 @@ export default {
     if (statusCode != 200 || body.err_code !== 0) throw new Error('获取热门评论失败')
     return { source: 'kg', comments: this.filterComment(body.weightList || []) }
   },
-  async getReplyComment({ songmid }, replyId, page = 1, limit = 100) {
+  async getReplyComment({ songmid, audioId }, replyId, page = 1, limit = 100) {
     if (this._requestObj2) this._requestObj2.cancelHttp()
 
+    songmid = songmid.length == 32 // 修复歌曲ID存储变更导致图片获取失败的问题
+      ? audioId.split('_')[0]
+      : songmid
+
     const _requestObj2 = httpFetch(`http://comment.service.kugou.com/index.php?r=commentsv2/getReplyWithLike&code=fc4be23b4e972707f36b8a828a93ba8a&p=${page}&pagesize=${limit}&ver=1.01&clientver=8373&kugouid=687373022&appid=1001&childrenid=${songmid}&tid=${replyId}`, {
       headers: {
         'User-Agent': 'Android712-AndroidPhone-8983-18-0-COMMENT-wifi',

src/renderer/utils/music/kg/musicSearch.js

@@ -48,7 +48,7 @@ export default {
       name: decodeName(rawData.songname),
       albumName: decodeName(rawData.album_name),
       albumId: rawData.album_id,
-      songmid: rawData.hash,
+      songmid: rawData.audio_id,
       source: 'kg',
       interval: formatPlayTime(rawData.duration),
       _interval: rawData.duration,
@@ -58,7 +58,6 @@ export default {
       hash: rawData.hash,
       types,
       _types,
-      audioId: rawData.audio_id + '_' + rawData.hash,
       typeUrl: {},
     }
   },

src/renderer/utils/music/kg/pic.js

@@ -20,7 +20,10 @@ export default {
           relate: 1,
           resource: [
             {
-              album_audio_id: songInfo.songmid,
+              album_audio_id:
+                songInfo.songmid.length == 32 // 修复歌曲ID存储变更导致图片获取失败的问题
+                  ? songInfo.audioId.split('_')[0]
+                  : songInfo.songmid,
               album_id: songInfo.albumId,
               hash: songInfo.hash,
               id: 0,