Merge branch 'openKg' into dev

publish/changeLog.md

@@ -7,3 +7,4 @@
 - 修正火影皮肤名字
 - 修复当试听列表为空时，无法切到其他界面的Bug
 - 修复百度源搜索结果为空时的接口处理Bug
+- 恢复酷狗其他音质播放

src/renderer/components/core/Player.vue

@@ -367,7 +367,7 @@ export default {
     getPlayType(highQuality, songInfo) {
       switch (songInfo.source) {
         case 'wy':
-        case 'kg':
+        // case 'kg':
           return '128k'
       }
       let type = songInfo._types['192k'] ? '192k' : '128k'

src/renderer/components/material/DownloadModal.vue

@@ -52,7 +52,7 @@ export default {
     checkSource(type) {
       switch (this.musicInfo.source) {
         case 'wy':
-        case 'kg':
+        // case 'kg':
           return type == '128k'
 
         default:

src/renderer/store/modules/songList.js

@@ -20,6 +20,7 @@ const state = {
   },
   listDetail: {
     list: [],
+    desc: null,
     total: 0,
     page: 1,
     limit: 30,
@@ -83,12 +84,13 @@ const mutations = {
     state.list.page = page
     state.list.key = key
   },
-  setListDetail(state, { result, key, page }) {
+  setListDetail(state, { result, key, page, desc }) {
     state.listDetail.list = result.list
     state.listDetail.total = result.total
     state.listDetail.limit = result.limit
     state.listDetail.page = page
     state.listDetail.key = key
+    state.listDetail.desc = result.desc
   },
   setVisibleListDetail(state, bool) {
     state.isVisibleListDetail = bool

src/renderer/utils/music/utils.js

@@ -7,7 +7,7 @@
 const types = ['flac', 'ape', '320k', '192k', '128k']
 export const getMusicType = (info, type) => {
   switch (window.globalObj.apiSource) {
-    case 'kg':
+    // case 'kg':
     case 'wy':
       return '128k'
   }

src/renderer/views/Leaderboard.vue

@@ -117,7 +117,7 @@ export default {
     },
     handleAddDownloadMultiple(type) {
       switch (this.source) {
-        case 'kg':
+        // case 'kg':
         case 'wy':
           type = '128k'
       }

src/renderer/views/SongList.vue

@@ -8,7 +8,7 @@
             span(:class="$style.playNum" v-if="selectListInfo.play_count") {{selectListInfo.play_count}}
           div(:class="$style.songListHeaderMiddle")
             h3(:title="selectListInfo.name") {{selectListInfo.name}}
-            p(:title="selectListInfo.desc") {{selectListInfo.desc}}
+            p(:title="selectListInfo.desc") {{listDetail.desc || selectListInfo.desc}}
           div(:class="$style.songListHeaderRight")
             material-btn(:class="$style.closeDetailButton" @click="hideListDetail") 返回
         material-song-list(v-model="selectdData" @action="handleSongListAction" :source="source" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" :list="listDetail.list")
@@ -191,7 +191,7 @@ export default {
     },
     handleAddDownloadMultiple(type) {
       switch (this.source) {
-        case 'kg':
+        // case 'kg':
         case 'wy':
           type = '128k'
       }