From f23ecdf902d86fc59ac740187497c70bf32bba3e Mon Sep 17 00:00:00 2001 From: Xiaocge Date: Sat, 23 Mar 2024 16:17:56 +0800 Subject: [PATCH 01/24] Update beta-pack.yml --- .github/workflows/beta-pack.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml index 2f672bf..ae9cec3 100644 --- a/.github/workflows/beta-pack.yml +++ b/.github/workflows/beta-pack.yml @@ -1,9 +1,7 @@ name: Build Beta on: - push: - branches: - - beta + workflow_dispatch: jobs: Android: From df808d1504fb1680a67a6e29d569fb385602ae7a Mon Sep 17 00:00:00 2001 From: Xiaocge Date: Sat, 23 Mar 2024 16:18:59 +0800 Subject: [PATCH 02/24] Update beta-pack.yml --- .github/workflows/beta-pack.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml index 2f672bf..ae9cec3 100644 --- a/.github/workflows/beta-pack.yml +++ b/.github/workflows/beta-pack.yml @@ -1,9 +1,7 @@ name: Build Beta on: - push: - branches: - - beta + workflow_dispatch: jobs: Android: From 57d6425a56434ecae57f7adb69bc663381402f90 Mon Sep 17 00:00:00 2001 From: zx <834688422@qq.com> Date: Sat, 23 Mar 2024 16:36:19 +0800 Subject: [PATCH 03/24] =?UTF-8?q?flac=20=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/music/utils.ts | 36 ++++++++++++++++++------------------ src/lang/en_us.json | 4 ++-- src/lang/zh_cn.json | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/core/music/utils.ts b/src/core/music/utils.ts index e1c1c23..dc7fed4 100644 --- a/src/core/music/utils.ts +++ b/src/core/music/utils.ts @@ -16,7 +16,7 @@ import { apis } from '@/utils/musicSdk/api-source' const getOtherSourcePromises = new Map() export const existTimeExp = /\[\d{1,2}:.*\d{1,4}\]/ -export const getOtherSource = async(musicInfo: LX.Music.MusicInfo | LX.Download.ListItem, isRefresh = false): Promise => { +export const getOtherSource = async (musicInfo: LX.Music.MusicInfo | LX.Download.ListItem, isRefresh = false): Promise => { if (!isRefresh) { const cachedInfo = await getOtherSourceFromStore(musicInfo.id) if (cachedInfo.length) return cachedInfo @@ -71,7 +71,7 @@ export const getOtherSource = async(musicInfo: LX.Music.MusicInfo | LX.Download. } -export const buildLyricInfo = async(lyricInfo: MakeOptional): Promise => { +export const buildLyricInfo = async (lyricInfo: MakeOptional): Promise => { if (!settingState.setting['player.isS2t']) { // @ts-expect-error if (lyricInfo.rawlrcInfo) return lyricInfo @@ -117,7 +117,7 @@ export const buildLyricInfo = async(lyricInfo: MakeOptional => { +export const getCachedLyricInfo = async (musicInfo: LX.Music.MusicInfo): Promise => { let lrcInfo = await getStoreLyric(musicInfo) // lrcInfo = {} if (existTimeExp.test(lrcInfo.lyric) && lrcInfo.tlyric != null) { @@ -146,7 +146,7 @@ export const getCachedLyricInfo = async(musicInfo: LX.Music.MusicInfo): Promise< return null } -export const getOnlineOtherSourceMusicUrlByLocal = async(musicInfo: LX.Music.MusicInfoLocal, isRefresh: boolean): Promise<{ +export const getOnlineOtherSourceMusicUrlByLocal = async (musicInfo: LX.Music.MusicInfoLocal, isRefresh: boolean): Promise<{ url: string quality: LX.Quality isFromCache: boolean @@ -170,7 +170,7 @@ export const getOnlineOtherSourceMusicUrlByLocal = async(musicInfo: LX.Music.Mus }) } -export const getOnlineOtherSourceLyricByLocal = async(musicInfo: LX.Music.MusicInfoLocal, isRefresh: boolean): Promise<{ +export const getOnlineOtherSourceLyricByLocal = async (musicInfo: LX.Music.MusicInfoLocal, isRefresh: boolean): Promise<{ lyricInfo: LX.Music.LyricInfo isFromCache: boolean }> => { @@ -191,7 +191,7 @@ export const getOnlineOtherSourceLyricByLocal = async(musicInfo: LX.Music.MusicI }) } -export const getOnlineOtherSourcePicByLocal = async(musicInfo: LX.Music.MusicInfoLocal): Promise<{ +export const getOnlineOtherSourcePicByLocal = async (musicInfo: LX.Music.MusicInfoLocal): Promise<{ url: string }> => { if (!await global.lx.apiInitPromise[0]) throw new Error('source init failed') @@ -211,11 +211,11 @@ export const getOnlineOtherSourcePicByLocal = async(musicInfo: LX.Music.MusicInf export const getPlayQuality = (highQuality: boolean, musicInfo: LX.Music.MusicInfoOnline): LX.Quality => { let type: LX.Quality = '128k' let list = global.lx.qualityList[musicInfo.source] - if (highQuality && musicInfo.meta._qualitys['320k'] && list && list.includes('320k')) type = '320k' + if (highQuality && musicInfo.meta._qualitys['flac'] && list && list.includes('flac')) type = 'flac' return type } -export const getOnlineOtherSourceMusicUrl = async({ musicInfos, quality, onToggleSource, isRefresh, retryedSource = [] }: { +export const getOnlineOtherSourceMusicUrl = async ({ musicInfos, quality, onToggleSource, isRefresh, retryedSource = [] }: { musicInfos: LX.Music.MusicInfoOnline[] quality?: LX.Quality onToggleSource: (musicInfo?: LX.Music.MusicInfoOnline) => void @@ -269,7 +269,7 @@ export const getOnlineOtherSourceMusicUrl = async({ musicInfos, quality, onToggl /** * 获取在线音乐URL */ -export const handleGetOnlineMusicUrl = async({ musicInfo, quality, onToggleSource, isRefresh, allowToggleSource }: { +export const handleGetOnlineMusicUrl = async ({ musicInfo, quality, onToggleSource, isRefresh, allowToggleSource }: { musicInfo: LX.Music.MusicInfoOnline quality?: LX.Quality isRefresh: boolean @@ -293,7 +293,7 @@ export const handleGetOnlineMusicUrl = async({ musicInfo, quality, onToggleSourc } return reqPromise.then(({ url, type }: { url: string, type: LX.Quality }) => { return { musicInfo, url, quality: type, isFromCache: false } - }).catch(async(err: any) => { + }).catch(async (err: any) => { console.log(err) if (!allowToggleSource || err.message == requestMsg.tooManyRequests) throw err onToggleSource() @@ -315,7 +315,7 @@ export const handleGetOnlineMusicUrl = async({ musicInfo, quality, onToggleSourc } -export const getOnlineOtherSourcePicUrl = async({ musicInfos, onToggleSource, isRefresh, retryedSource = [] }: { +export const getOnlineOtherSourcePicUrl = async ({ musicInfos, onToggleSource, isRefresh, retryedSource = [] }: { musicInfos: LX.Music.MusicInfoOnline[] onToggleSource: (musicInfo?: LX.Music.MusicInfoOnline) => void isRefresh: boolean @@ -358,7 +358,7 @@ export const getOnlineOtherSourcePicUrl = async({ musicInfos, onToggleSource, is /** * 获取在线歌曲封面 */ -export const handleGetOnlinePicUrl = async({ musicInfo, isRefresh, onToggleSource, allowToggleSource }: { +export const handleGetOnlinePicUrl = async ({ musicInfo, isRefresh, onToggleSource, allowToggleSource }: { musicInfo: LX.Music.MusicInfoOnline onToggleSource: (musicInfo?: LX.Music.MusicInfoOnline) => void isRefresh: boolean @@ -377,7 +377,7 @@ export const handleGetOnlinePicUrl = async({ musicInfo, isRefresh, onToggleSourc } return reqPromise.then((url: string) => { return { musicInfo, url, isFromCache: false } - }).catch(async(err: any) => { + }).catch(async (err: any) => { console.log(err) if (!allowToggleSource) throw err onToggleSource() @@ -398,7 +398,7 @@ export const handleGetOnlinePicUrl = async({ musicInfo, isRefresh, onToggleSourc } -export const getOnlineOtherSourceLyricInfo = async({ musicInfos, onToggleSource, isRefresh, retryedSource = [] }: { +export const getOnlineOtherSourceLyricInfo = async ({ musicInfos, onToggleSource, isRefresh, retryedSource = [] }: { musicInfos: LX.Music.MusicInfoOnline[] onToggleSource: (musicInfo?: LX.Music.MusicInfoOnline) => void isRefresh: boolean @@ -433,7 +433,7 @@ export const getOnlineOtherSourceLyricInfo = async({ musicInfos, onToggleSource, reqPromise = Promise.reject(err) } // retryedSource.includes(musicInfo.source) - return reqPromise.then(async(lyricInfo: LX.Music.LyricInfo) => { + return reqPromise.then(async (lyricInfo: LX.Music.LyricInfo) => { return existTimeExp.test(lyricInfo.lyric) ? { lyricInfo, musicInfo, @@ -449,7 +449,7 @@ export const getOnlineOtherSourceLyricInfo = async({ musicInfos, onToggleSource, /** * 获取在线歌词信息 */ -export const handleGetOnlineLyricInfo = async({ musicInfo, onToggleSource, isRefresh, allowToggleSource }: { +export const handleGetOnlineLyricInfo = async ({ musicInfo, onToggleSource, isRefresh, allowToggleSource }: { musicInfo: LX.Music.MusicInfoOnline onToggleSource: (musicInfo?: LX.Music.MusicInfoOnline) => void isRefresh: boolean @@ -467,13 +467,13 @@ export const handleGetOnlineLyricInfo = async({ musicInfo, onToggleSource, isRef } catch (err) { reqPromise = Promise.reject(err) } - return reqPromise.then(async(lyricInfo: LX.Music.LyricInfo) => { + return reqPromise.then(async (lyricInfo: LX.Music.LyricInfo) => { return existTimeExp.test(lyricInfo.lyric) ? { musicInfo, lyricInfo, isFromCache: false, } : Promise.reject(new Error('failed')) - }).catch(async(err: any) => { + }).catch(async (err: any) => { console.log(err) if (!allowToggleSource) throw err diff --git a/src/lang/en_us.json b/src/lang/en_us.json index e574fbf..818dc8a 100644 --- a/src/lang/en_us.json +++ b/src/lang/en_us.json @@ -338,7 +338,7 @@ "setting_play_handle_audio_focus": "When other apps play sound, automatically pause the playback", "setting_play_handle_audio_focus_tip": "Take effect after restarting the application", "setting_play_lyric_transition": "Show lyrics translation", - "setting_play_quality": "Play 320K quality songs first (if supported)", + "setting_play_quality": "Play flac quality songs first (if supported)", "setting_play_s2t": "Convert the played lyrics to Traditional Chinese", "setting_play_save_play_time": "Remember playback progress", "setting_play_show_notification_image": "Show song picture in notification bar", @@ -499,4 +499,4 @@ "version_title_new": "🌟 New version found 🌟", "version_title_unknown": "❓ Failed to get the latest version information ❓", "version_title_update": "🚀 Program update 🚀" -} +} \ No newline at end of file diff --git a/src/lang/zh_cn.json b/src/lang/zh_cn.json index dc475d3..2ba3c49 100644 --- a/src/lang/zh_cn.json +++ b/src/lang/zh_cn.json @@ -338,7 +338,7 @@ "setting_play_handle_audio_focus": "其他应用播放声音时，自动暂停播放", "setting_play_handle_audio_focus_tip": "重启应用后生效", "setting_play_lyric_transition": "显示歌词翻译", - "setting_play_quality": "优先播放320K品质的歌曲（如果支持）", + "setting_play_quality": "优先播放flac品质的歌曲（如果支持）", "setting_play_s2t": "将播放的歌词转繁体", "setting_play_save_play_time": "记住播放进度", "setting_play_show_notification_image": "在通知栏显示歌曲图片", @@ -499,4 +499,4 @@ "version_title_new": "🌟 发现新版本 🌟", "version_title_unknown": "❓ 获取最新版本信息失败 ❓", "version_title_update": "🚀 程序更新 🚀" -} +} \ No newline at end of file From a9c7d19e524a346f881684c633b37fb11faa30a2 Mon Sep 17 00:00:00 2001 From: zx <834688422@qq.com> Date: Sat, 23 Mar 2024 16:51:14 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E7=89=88=E6=9C=AC=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 ++-- src/navigation/components/PactModal.tsx | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 3350494..38e505a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-mobile", - "version": "1.3.0-beta.1", + "version": "8.8.8-肥猫宝贝", "versionCode": 63, "private": true, "scripts": { @@ -88,4 +88,4 @@ "eslint-plugin-react-hooks": "^4.6.0", "typescript": "^5.4.2" } -} +} \ No newline at end of file diff --git a/src/navigation/components/PactModal.tsx b/src/navigation/components/PactModal.tsx index 3998165..6d432da 100644 --- a/src/navigation/components/PactModal.tsx +++ b/src/navigation/components/PactModal.tsx @@ -66,7 +66,7 @@ const Footer = ({ componentId }: { componentId: string }) => { const theme = useTheme() const isAgreePact = useSettingValue('common.isAgreePact') // const checkUpdate = useDispatch('common', 'checkUpdate') - const [time, setTime] = useState(20) + const [time, setTime] = useState(1) const handleRejct = () => { exitApp() @@ -121,7 +121,7 @@ const Footer = ({ componentId }: { componentId: string }) => { return () => { timeoutTools.clear() } - // eslint-disable-next-line react-hooks/exhaustive-deps + // eslint-disable-next-line react-hooks/exhaustive-deps }, []) return ( @@ -130,18 +130,18 @@ const Footer = ({ componentId }: { componentId: string }) => { isAgreePact ? null : ( - 若你（使用者）接受以上协议，请点击下面的“接受”按钮签署本协议，若不接受，请点击“不接受”后退出软件并清除本软件的所有数据。 - ) + 若你（使用者）接受以上协议，请点击下面的“接受”按钮签署本协议，若不接受，请点击“不接受”后退出软件并清除本软件的所有数据。 + ) } { isAgreePact ? null : ( - - ) + + ) } - ) + + ) } - ) + + ) }