From 95f38e804825c2d019617fbb39ad84efa590d59b Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 22 Nov 2020 11:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=89=E6=AD=8C=E8=AF=8D?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E4=B8=8E=E6=97=A0=E6=AD=8C=E8=AF=8D=E7=9A=84?= =?UTF-8?q?=E9=9F=B3=E4=B9=90=E9=97=B4=E5=88=87=E6=8D=A2=E4=BC=9A=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=AD=8C=E8=AF=8D=E7=BF=BB=E8=AF=91=E6=AE=8B=E7=95=99?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 13 +------------ src/renderer-lyric/components/core/Lyric.vue | 2 +- src/renderer/components/core/Player.vue | 3 ++- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index f744f593..d74ebb0a 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,15 +1,4 @@ -### 新增 - -- 托盘菜单新增显示、隐藏主界面选项,为Linux、MAC版添加托盘菜单 -- 新增播放进度信息保存 - -### 优化 - -- 移除kg源的歌词文件开头的空白字符串 ### 修复 -- 修复专辑图片无法嵌入的问题 -- 修复播放状态栏切换“上一首”歌曲按钮提示错误的问题 -- 修复移动单首歌曲时,如果目标列表存在该歌曲,会导致将源列表与目标列表里的目标歌曲移除 -- 修复kg源歌曲信息带有单引号等特殊字符被转义的问题 +- 修复有歌词翻译与无歌词的音乐间切换会导致歌词翻译残留显示的问题 diff --git a/src/renderer-lyric/components/core/Lyric.vue b/src/renderer-lyric/components/core/Lyric.vue index c73bd333..e431fc72 100644 --- a/src/renderer-lyric/components/core/Lyric.vue +++ b/src/renderer-lyric/components/core/Lyric.vue @@ -279,7 +279,7 @@ export default { rendererSend(NAMES.winLyric.close) }, setLyric() { - window.lrc.setLyric((this.isShowLyricTransition && this.lyrics.tlyric ? this.lyrics.tlyric + '\n' : '') + this.lyrics.lyric) + window.lrc.setLyric((this.isShowLyricTransition && this.lyrics.tlyric ? (this.lyrics.tlyric + '\n') : '') + (this.lyrics.lyric || '')) }, }, } diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index b86e92d9..6ec7aca0 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -713,6 +713,7 @@ export default { this.status = this.musicInfo.name = this.musicInfo.singer = '' this.musicInfo.songmid = null this.musicInfo.lrc = null + this.musicInfo.tlrc = null this.musicInfo.url = null this.nowPlayTime = 0 this.maxPlayTime = 0 @@ -891,7 +892,7 @@ export default { }) }, setLyric() { - window.lrc.setLyric((this.setting.player.isShowLyricTransition && this.musicInfo.tlrc ? this.musicInfo.tlrc + '\n' : '') + this.musicInfo.lrc) + window.lrc.setLyric((this.setting.player.isShowLyricTransition && this.musicInfo.tlrc ? (this.musicInfo.tlrc + '\n') : '') + (this.musicInfo.lrc || '')) if (this.isPlay && (this.musicInfo.url || this.listId == 'download')) { window.lrc.play(audio.currentTime * 1000) this.handleUpdateWinLyricInfo('play', audio.currentTime * 1000)