From 67ff5e5a4ad1e2a42db1d4710981a1ee760f272f Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 9 Sep 2019 00:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=88=97=E8=A1=A8=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E4=BD=93=E9=AA=8C=EF=BC=8C=E7=A7=BB=E9=99=A4=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 4 +++ src/renderer/components/core/Toolbar.vue | 6 ++-- .../components/material/DownloadModal.vue | 4 +-- src/renderer/components/material/SongList.vue | 4 +-- src/renderer/utils/music/utils.js | 2 +- src/renderer/views/Leaderboard.vue | 2 +- src/renderer/views/List.vue | 31 ++++++++++++++++--- src/renderer/views/Setting.vue | 20 ++++++------ src/renderer/views/SongList.vue | 2 +- 9 files changed, 50 insertions(+), 25 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 765965e2..f3cfe1f9 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -7,8 +7,12 @@ ### 优化 - 略微优化最小化按钮字符 +- 优化试听列表的加载体验，当歌曲数过多时列表将延迟加载 ### 修复 - 修复下载管理的一些Bug +### 移除 + +- 因接口失效，移除网易云音源，酷狗音源仅支持播放128k音质 diff --git a/src/renderer/components/core/Toolbar.vue b/src/renderer/components/core/Toolbar.vue index 33e9c7ea..77c7dd57 100644 --- a/src/renderer/components/core/Toolbar.vue +++ b/src/renderer/components/core/Toolbar.vue @@ -105,8 +105,8 @@ each(@themes, { content: ' '; display: block; border-radius: 50%; - width: 13px; - height: 13px; + width: 14px; + height: 14px; transition: background-color 0.2s ease-in-out; } @@ -145,7 +145,7 @@ each(@themes, { width: 8px; height: 2px; left: @height-toolbar / 2 - 4; - top: @height-toolbar / 2; + top: @height-toolbar / 2 - 1; background-color: #fff; } } diff --git a/src/renderer/components/material/DownloadModal.vue b/src/renderer/components/material/DownloadModal.vue index 90084384..ff64047d 100644 --- a/src/renderer/components/material/DownloadModal.vue +++ b/src/renderer/components/material/DownloadModal.vue @@ -5,7 +5,7 @@ material-modal(:show="show" :bg-close="bgClose" @close="handleClose") | {{ info.name }} br | {{ info.singer }} - material-btn(:class="$style.btn" :title="!checkSource(type.type) && '目前网易云音源仅支持下载128k音质'" :disabled="!checkSource(type.type)" :key="type.type" @click="handleClick(type.type)" v-for="type in info.types") {{getTypeName(type.type)}} {{ type.type.toUpperCase() }}{{ type.size && ` - ${type.size.toUpperCase()}` }} + material-btn(:class="$style.btn" :title="!checkSource(type.type) && '目前酷狗音源仅支持下载128k音质'" :disabled="!checkSource(type.type)" :key="type.type" @click="handleClick(type.type)" v-for="type in info.types") {{getTypeName(type.type)}} {{ type.type.toUpperCase() }}{{ type.size && ` - ${type.size.toUpperCase()}` }} @@ -52,7 +52,7 @@ export default { checkSource(type) { switch (this.musicInfo.source) { case 'wy': - // case 'kg': + case 'kg': return type == '128k' default: diff --git a/src/renderer/components/material/SongList.vue b/src/renderer/components/material/SongList.vue index 3ef76c16..084dfec2 100644 --- a/src/renderer/components/material/SongList.vue +++ b/src/renderer/components/material/SongList.vue @@ -27,7 +27,7 @@ div(:class="$style.songList") td.break(style="width: 20%;") {{item.singer}} td.break(style="width: 22%;") {{item.albumName}} td(style="width: 18%;") - material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx')" :download-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx')" :remove-btn="false" @btn-click="handleListBtnClick") + material-list-buttons(:index="index" :search-btn="true" :play-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')" :download-btn="item.source == 'kw' || (!isAPITemp && item.source != 'tx' && item.source != 'wy')" :remove-btn="false" @btn-click="handleListBtnClick") //- 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)') ＋ @@ -136,7 +136,7 @@ export default { this.clickIndex = index return } - this.emitEvent((this.source == 'kw' || (!this.isAPITemp && this.list[index].source != 'tx')) ? 'testPlay' : 'search', index) + this.emitEvent((this.source == 'kw' || (!this.isAPITemp && this.list[index].source != 'tx' && this.list[index].source != 'wy')) ? 'testPlay' : 'search', index) this.clickTime = 0 this.clickIndex = -1 }, diff --git a/src/renderer/utils/music/utils.js b/src/renderer/utils/music/utils.js index 2b43f645..9783dd64 100644 --- a/src/renderer/utils/music/utils.js +++ b/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' } diff --git a/src/renderer/views/Leaderboard.vue b/src/renderer/views/Leaderboard.vue index 3789a9e2..3a4d5270 100644 --- a/src/renderer/views/Leaderboard.vue +++ b/src/renderer/views/Leaderboard.vue @@ -117,7 +117,7 @@ export default { }, handleAddDownloadMultiple(type) { switch (this.source) { - // case 'kg': + case 'kg': case 'wy': type = '128k' } diff --git a/src/renderer/views/List.vue b/src/renderer/views/List.vue index eecb93ed..6275b9ef 100644 --- a/src/renderer/views/List.vue +++ b/src/renderer/views/List.vue @@ -1,7 +1,7 @@