From c12bc8a4df48a30b44f1a081ac63cd6f9157da58 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 20 Sep 2023 13:39:34 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=AD=8C=E6=9B=B2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=96=9C=E6=AC=A2=E6=AD=8C?= =?UTF-8?q?=E6=9B=B2=E6=97=B6=E9=9C=80=E8=A6=81=E4=BA=8C=E6=AC=A1=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E9=98=B2=E6=AD=A2=E6=89=8B=E6=8A=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 4 ++++ src/components/OnlineList/listAction.ts | 10 +++++++++- src/lang/en_us.json | 3 +++ src/lang/zh_cn.json | 3 +++ src/screens/Home/Views/Mylist/MusicList/listAction.ts | 10 +++++++++- 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 162099d..f7e4863 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,7 @@ +### 优化 + +- 通过歌曲菜单添加不喜欢歌曲时需要二次确认防止手抖 + ### 修复 - 修复横屏状态下的歌词滚动位置计算问题 diff --git a/src/components/OnlineList/listAction.ts b/src/components/OnlineList/listAction.ts index d1c7f3c..b778d94 100644 --- a/src/components/OnlineList/listAction.ts +++ b/src/components/OnlineList/listAction.ts @@ -4,7 +4,7 @@ import { playList, playNext } from '@/core/player/player' import { addTempPlayList } from '@/core/player/tempPlayList' import settingState from '@/store/setting/state' import { getListMusicSync } from '@/utils/listManage' -import { shareMusic } from '@/utils/tools' +import { confirmDialog, shareMusic, toast } from '@/utils/tools' import { addDislikeInfo, hasDislike } from '@/core/dislikeList' import playerState from '@/store/player/state' @@ -30,7 +30,15 @@ export const handleShare = (musicInfo: LX.Music.MusicInfoOnline) => { } export const handleDislikeMusic = async(musicInfo: LX.Music.MusicInfoOnline) => { + const confirm = await confirmDialog({ + message: global.i18n.t('lists_dislike_music_tip', { name: musicInfo.name }), + cancelButtonText: global.i18n.t('cancel_button_text_2'), + confirmButtonText: global.i18n.t('confirm_button_text'), + bgClose: false, + }) + if (!confirm) return await addDislikeInfo([{ name: musicInfo.name, singer: musicInfo.singer }]) + toast(global.i18n.t('lists_dislike_music_add_tip')) if (hasDislike(playerState.playMusicInfo.musicInfo)) { void playNext(true) } diff --git a/src/lang/en_us.json b/src/lang/en_us.json index e2a37d1..5d62c29 100644 --- a/src/lang/en_us.json +++ b/src/lang/en_us.json @@ -5,6 +5,7 @@ "back": "Back", "back_home": "Back", "cancel": "Cancel", + "cancel_button_text_2": "No, no, no, wrong click", "change_position": "Change Position", "change_position_list_title": "Change the position of the list", "change_position_music_multi_title": "Adjust the position of the selected {num} song to", @@ -88,6 +89,8 @@ "list_temp": "Temp list", "list_update_error": "{name} failed to update", "list_update_success": "{name} updated successfully", + "lists_dislike_music_add_tip": "Added", + "lists_dislike_music_tip": "Do you really dislike {name}?", "load_failed": "Ah, loading failed 😥", "loading": "Loading...", "location": "From {location}", diff --git a/src/lang/zh_cn.json b/src/lang/zh_cn.json index d7e2e10..1982ef1 100644 --- a/src/lang/zh_cn.json +++ b/src/lang/zh_cn.json @@ -5,6 +5,7 @@ "back": "返回", "back_home": "返回桌面", "cancel": "取消", + "cancel_button_text_2": "不不不，点错了", "change_position": "调整位置", "change_position_list_title": "调整列表位置", "change_position_music_multi_title": "将已选的 {num} 首歌曲的位置调整到", @@ -88,6 +89,8 @@ "list_temp": "临时列表", "list_update_error": "{name} 更新失败", "list_update_success": "{name} 更新成功", + "lists_dislike_music_add_tip": "已添加", + "lists_dislike_music_tip": "你真的不喜欢 {name} 吗？", "load_failed": "啊 加载失败了 😥", "loading": "加载中...", "location": "来自{location}", diff --git a/src/screens/Home/Views/Mylist/MusicList/listAction.ts b/src/screens/Home/Views/Mylist/MusicList/listAction.ts index e3fdff1..9b71d9a 100644 --- a/src/screens/Home/Views/Mylist/MusicList/listAction.ts +++ b/src/screens/Home/Views/Mylist/MusicList/listAction.ts @@ -3,7 +3,7 @@ import { playList, playNext } from '@/core/player/player' import { addTempPlayList } from '@/core/player/tempPlayList' import settingState from '@/store/setting/state' import { similar, sortInsert } from '@/utils' -import { confirmDialog, shareMusic } from '@/utils/tools' +import { confirmDialog, shareMusic, toast } from '@/utils/tools' import { addDislikeInfo, hasDislike } from '@/core/dislikeList' import playerState from '@/store/player/state' @@ -72,7 +72,15 @@ export const searchListMusic = (list: LX.Music.MusicInfo[], text: string) => { } export const handleDislikeMusic = async(musicInfo: SelectInfo['musicInfo']) => { + const confirm = await confirmDialog({ + message: global.i18n.t('lists_dislike_music_tip', { name: musicInfo.name }), + cancelButtonText: global.i18n.t('cancel_button_text_2'), + confirmButtonText: global.i18n.t('confirm_button_text'), + bgClose: false, + }) + if (!confirm) return await addDislikeInfo([{ name: musicInfo.name, singer: musicInfo.singer }]) + toast(global.i18n.t('lists_dislike_music_add_tip')) if (hasDislike(playerState.playMusicInfo.musicInfo)) { void playNext(true) }