From 50d029c671b9fa3a9ba6744288c7ad9a7182cb9b Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Sun, 15 Dec 2019 21:03:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4Q=E9=9F=B3=E6=BA=90=E7=9A=84?=
 =?UTF-8?q?=E8=AF=95=E5=90=AC=E4=B8=8E=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 publish/changeLog.md                          |  4 ++++
 src/renderer/components/core/Player.vue       |  2 +-
 src/renderer/components/material/SongList.vue | 10 +++++-----
 src/renderer/views/List.vue                   |  8 ++++----
 src/renderer/views/Search.vue                 | 10 +++++-----
 src/renderer/views/SongList.vue               |  8 ++++++--
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/publish/changeLog.md b/publish/changeLog.md
index f28aa3cc..3adfdbeb 100644
--- a/publish/changeLog.md
+++ b/publish/changeLog.md
@@ -12,6 +12,10 @@
 
 - 修复存在弹出层时，搜索建议列表被弹出层覆盖的问题
 
+### 移除
+
+- 因Q音接口失效，移除Q音源的试听与下载
+
 ### 其他
 
 - 更新electron到7.1.5
diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue
index 0abf5b06..646cce0d 100644
--- a/src/renderer/components/core/Player.vue
+++ b/src/renderer/components/core/Player.vue
@@ -339,7 +339,7 @@ export default {
       } else if (this.isAPITemp) {
         list = this.list.filter(s => s.source == 'kw')
       } else {
-        list = this.list
+        list = this.list.filter(s => s.source != 'tx')
       }
       if (!list.length) return this.setPlayIndex(-1)
       let playIndex = this.list === list ? this.playIndex : list.indexOf(this.list[this.playIndex])
diff --git a/src/renderer/components/material/SongList.vue b/src/renderer/components/material/SongList.vue
index ea117e49..15fd5524 100644
--- a/src/renderer/components/material/SongList.vue
+++ b/src/renderer/components/material/SongList.vue
@@ -29,9 +29,9 @@ div(:class="$style.songList")
               td(style="width: 20%; padding-left: 0; padding-right: 0;")
                 material-list-buttons(:index="index" :search-btn="true"
                   :remove-btn="false" @btn-click="handleListBtnClick"
-                  :listAdd-btn="item.source == 'kw' || (!isAPITemp)"
-                  :play-btn="item.source == 'kw' || (!isAPITemp)"
-                  :download-btn="item.source == 'kw' || (!isAPITemp)")
+                  :listAdd-btn="item.source == 'kw' || !isAPITemp"
+                  :play-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)"
+                  :download-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)")
                 //- button.btn-info(type='button' v-if="item._types['128k'] || item._types['192k'] || item._types['320k'] || item._types.flac" @click.stop='openDownloadModal(index)') 下载
                 //- button.btn-secondary(type='button' v-if="item._types['128k'] || item._types['192k'] || item._types['320k']" @click.stop='testPlay(index)') 试听
                 //- button.btn-success(type='button' v-if="(item._types['128k'] || item._types['192k'] || item._types['320k']) && userInfo" @click.stop='showListModal(index)') ＋
@@ -40,7 +40,7 @@ div(:class="$style.songList")
           material-pagination(:count="total" :limit="limit" :page="page" @btn-click="handleTogglePage")
     div(v-else :class="$style.noitem")
       p(v-html="noItem")
-  material-flow-btn(:show="isShowEditBtn && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
+  material-flow-btn(:show="isShowEditBtn && source != 'tx' && (source == 'kw' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
 </template>
 
 <script>
@@ -140,7 +140,7 @@ export default {
         this.clickIndex = index
         return
       }
-      this.emitEvent((this.source == 'kw' || !this.isAPITemp) ? 'testPlay' : 'search', index)
+      this.emitEvent((this.source != 'tx' && (this.source == 'kw' || !this.isAPITemp)) ? 'testPlay' : 'search', index)
       this.clickTime = 0
       this.clickIndex = -1
     },
diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue
index ec7bfae8..c6f8b145 100644
--- a/src/renderer/views/List.vue
+++ b/src/renderer/views/List.vue
@@ -18,7 +18,7 @@
         table
           tbody
             tr(v-for='(item, index) in list' :key='item.songmid' :id="'mid_' + item.songmid"
-              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') ? $style.disabled : '']")
+              @click="handleDoubleClick(index)" :class="[isPlayList && playIndex === index ? $style.active : '', (isAPITemp && item.source != 'kw') || item.source == 'tx' ? $style.disabled : '']")
               td.nobreak.center(style="width: 37px;" @click.stop)
                   material-checkbox(:id="index.toString()" v-model="selectdData" :value="item")
               td.break(style="width: 25%;")
@@ -243,7 +243,7 @@ export default {
       this.clickIndex = -1
     },
     testPlay(index) {
-      if (this.isAPITemp && this.list[index].source != 'kw') return
+      if (this.list[index].source == 'tx' || (this.isAPITemp && this.list[index].source != 'kw')) return
       this.setPlayList({ list: this.list, listId: this.listId, index })
     },
     handleRemove(index) {
@@ -253,7 +253,7 @@ export default {
       switch (info.action) {
         case 'download': {
           const minfo = this.list[info.index]
-          if (this.isAPITemp && minfo.source != 'kw') return
+          if ((this.isAPITemp && minfo.source != 'kw') || minfo.source == 'tx') return
           this.musicInfo = minfo
           this.$nextTick(() => {
             this.isShowDownload = true
@@ -286,7 +286,7 @@ export default {
       this.selectdData = []
     },
     handleAddDownloadMultiple(type) {
-      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : [...this.selectdData]
+      const list = this.setting.apiSource == 'temp' ? this.selectdData.filter(s => s.source == 'kw') : this.selectdData.filter(s => s.source != 'tx')
       this.createDownloadMultiple({ list, type })
       this.resetSelect()
       this.isShowDownloadMultiple = false
diff --git a/src/renderer/views/Search.vue b/src/renderer/views/Search.vue
index 0b531886..bf737b50 100644
--- a/src/renderer/views/Search.vue
+++ b/src/renderer/views/Search.vue
@@ -31,8 +31,8 @@
               td.break(style="width: 25%;") {{item.albumName}}
               td(style="width: 15%; padding-left: 0; padding-right: 0;")
                 material-list-buttons(:index="index" :remove-btn="false" :class="$style.listBtn"
-                  :play-btn="item.source == 'kw' || !isAPITemp"
-                  :download-btn="item.source == 'kw' || !isAPITemp"
+                  :play-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)"
+                  :download-btn="item.source != 'tx' && (item.source == 'kw' || !isAPITemp)"
                   @btn-click="handleListBtnClick")
               td(style="width: 10%;") {{item.interval || '--/--'}}
         div(:class="$style.pagination")
@@ -41,7 +41,7 @@
       p 搜我所想~~😉
     material-download-modal(:show="isShowDownload" :musicInfo="musicInfo" @select="handleAddDownload" @close="isShowDownload = false")
     material-download-multiple-modal(:show="isShowDownloadMultiple" :list="selectdData" @select="handleAddDownloadMultiple" @close="isShowDownloadMultiple = false")
-    material-flow-btn(:show="isShowEditBtn && (searchSourceId == 'kw' || searchSourceId == 'all' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
+    material-flow-btn(:show="isShowEditBtn && searchSourceId != 'tx' && (searchSourceId == 'kw' || searchSourceId == 'all' || !isAPITemp)" :remove-btn="false" @btn-click="handleFlowBtnClick")
     material-list-add-modal(:show="isShowListAdd" :musicInfo="musicInfo" @close="isShowListAdd = false")
     material-list-add-multiple-modal(:show="isShowListAddMultiple" :musicList="selectdData" @close="handleListAddModalClose")
 </template>
@@ -190,7 +190,7 @@ export default {
         targetSong = this.selectdData[0]
         this.listAddMultiple({ id: 'default', list: this.filterList(this.selectdData) })
       } else {
-        if (this.isAPITemp && this.listInfo.list[index].source != 'kw') return
+        if (this.listInfo.list[index].source == 'tx' || (this.isAPITemp && this.listInfo.list[index].source != 'kw')) return
         targetSong = this.listInfo.list[index]
         this.listAdd({ id: 'default', musicInfo: targetSong })
       }
@@ -239,7 +239,7 @@ export default {
       }
     },
     filterList(list) {
-      return this.setting.apiSource == 'temp' ? list.filter(s => s.source == 'kw') : [...list]
+      return this.setting.apiSource == 'temp' ? list.filter(s => s.source == 'kw') : list.filter(s => s.source != 'tx')
     },
     handleListAddModalClose(isSelect) {
       if (isSelect) this.resetSelect()
diff --git a/src/renderer/views/SongList.vue b/src/renderer/views/SongList.vue
index 3ae4d0b3..d5b36d88 100644
--- a/src/renderer/views/SongList.vue
+++ b/src/renderer/views/SongList.vue
@@ -183,10 +183,11 @@ export default {
       let targetSong
       if (index == null) {
         targetSong = this.selectdData[0]
-        this.listAddMultiple({ id: 'default', list: this.selectdData })
+        this.listAddMultiple({ id: 'default', list: this.filterList(this.selectdData) })
         this.resetSelect()
       } else {
         targetSong = this.listDetail.list[index]
+        if (targetSong.source == 'tx' || (this.isAPITemp && targetSong.source != 'kw')) return
         this.listAdd({ id: 'default', musicInfo: targetSong })
       }
       let targetIndex = this.defaultList.list.findIndex(
@@ -234,7 +235,7 @@ export default {
         case 'wy':
           type = '128k'
       }
-      this.createDownloadMultiple({ list: [...this.selectdData], type })
+      this.createDownloadMultiple({ list: this.filterList(this.selectdData), type })
       this.resetSelect()
       this.isShowDownloadMultiple = false
     },
@@ -345,6 +346,9 @@ export default {
       }
       this.importSongListText = text.replace(regx, '$1')
     },
+    filterList(list) {
+      return this.setting.apiSource == 'temp' ? list.filter(s => s.source == 'kw') : list.filter(s => s.source != 'tx')
+    },
     /*     addSongListDetail() {
       // this.detailLoading = true
       // this.getListDetailAll(this.selectListInfo.id).then(() => {