diff --git a/android/app/src/main/assets/script/user-api-preload.js b/android/app/src/main/assets/script/user-api-preload.js index 7b1f4a4..751b24d 100644 --- a/android/app/src/main/assets/script/user-api-preload.js +++ b/android/app/src/main/assets/script/user-api-preload.js @@ -151,11 +151,11 @@ globalThis.lx_setup = (key, id, name, description, version, author, homepage, ra } const allSources = ['kw', 'kg', 'tx', 'wy', 'mg', 'local'] const supportQualitys = { - kw: ['128k', '320k', 'flac', 'flac24bit'], - kg: ['128k', '320k', 'flac', 'flac24bit'], + kw: ['128k', '320k', 'flac', 'flac24bit', 'master'], + kg: ['128k', '320k', 'flac', 'flac24bit', 'master'], tx: ['128k', '320k', 'flac', 'flac24bit', 'master'], wy: ['128k', '320k', 'flac', 'flac24bit', 'master'], - mg: ['128k', '320k', 'flac', 'flac24bit'], + mg: ['128k', '320k', 'flac', 'flac24bit', 'master'], local: [], } const supportActions = { diff --git a/src/components/OnlineList/ListItem.tsx b/src/components/OnlineList/ListItem.tsx index d258817..8d4257f 100644 --- a/src/components/OnlineList/ListItem.tsx +++ b/src/components/OnlineList/ListItem.tsx @@ -15,7 +15,10 @@ export const ITEM_HEIGHT = scaleSizeH(LIST_ITEM_HEIGHT) const useQualityTag = (musicInfo: LX.Music.MusicInfoOnline) => { const t = useI18n() let info: { type: BadgeType | null, text: string } = { type: null, text: '' } - if (musicInfo.meta._qualitys.flac24bit) { + if (musicInfo.meta._qualitys.master) { + info.type = 'secondary' + info.text = t('quality_lossless_master') + } else if (musicInfo.meta._qualitys.flac24bit) { info.type = 'secondary' info.text = t('quality_lossless_24bit') } else if (musicInfo.meta._qualitys.flac ?? musicInfo.meta._qualitys.ape) { diff --git a/src/core/init/deeplink/utils.js b/src/core/init/deeplink/utils.js index 0ed03da..02533b4 100644 --- a/src/core/init/deeplink/utils.js +++ b/src/core/init/deeplink/utils.js @@ -12,7 +12,7 @@ export const sourceVerify = source => { if (!sources.includes(source)) throw new Error('Source no match') } -export const qualitys = ['128k', '320k', 'flac', 'flac24bit'] +export const qualitys = ['128k', '320k', 'flac', 'flac24bit', 'master'] export const qualityFilter = (source, types) => { types = types.filter(({ type }) => qualitys.includes(type)).map(({ type, size, hash }) => { if (size != null && typeof size != 'string') throw new Error(type + ' size type no match') diff --git a/src/lang/en_us.json b/src/lang/en_us.json index d1ced30..50e0046 100644 --- a/src/lang/en_us.json +++ b/src/lang/en_us.json @@ -205,7 +205,7 @@ "quality_high_quality": "HQ", "quality_lossless": "SQ", "quality_lossless_24bit": "Hires", - "quality_master": "Master", + "quality_lossless_master": "Master", "search__welcome": "Search what I want~~😉", "search_history_search": "History search", "search_hot_search": "popular searches", diff --git a/src/lang/zh_cn.json b/src/lang/zh_cn.json index fa3a75a..81466a6 100644 --- a/src/lang/zh_cn.json +++ b/src/lang/zh_cn.json @@ -205,7 +205,7 @@ "quality_high_quality": "HQ", "quality_lossless": "SQ", "quality_lossless_24bit": "Hires", - "quality_master": "臻品母带", + "quality_lossless_master": "臻品母带", "search__welcome": "搜我所想~~😉", "search_history_search": "历史搜索", "search_hot_search": "热门搜索", diff --git a/src/utils/musicSdk/api-source-info.ts b/src/utils/musicSdk/api-source-info.ts index 6b82bf0..a495653 100644 --- a/src/utils/musicSdk/api-source-info.ts +++ b/src/utils/musicSdk/api-source-info.ts @@ -11,11 +11,11 @@ const sources: Array<{ name: 'ikun公益音源', disabled: false, supportQualitys: { - kw: ['128k', '320k', 'flac', 'flac24bit'], - kg: ['128k', '320k', 'flac', 'flac24bit'], + kw: ['128k', '320k', 'flac', 'flac24bit', 'master'], + kg: ['128k', '320k', 'flac', 'flac24bit', 'master'], tx: ['128k', '320k', 'flac', 'flac24bit', 'master'], wy: ['128k', '320k', 'flac', 'flac24bit', 'master'], - mg: ['128k', '320k', 'flac', 'flac24bit'], + mg: ['128k', '320k', 'flac', 'flac24bit', 'master'], }, }, ] diff --git a/src/utils/musicSdk/tx/leaderboard.js b/src/utils/musicSdk/tx/leaderboard.js index 2f075f6..00a5c0c 100644 --- a/src/utils/musicSdk/tx/leaderboard.js +++ b/src/utils/musicSdk/tx/leaderboard.js @@ -139,7 +139,7 @@ export default { } } if (file.size_new[0] !== 0) { - let size = sizeFormate(file.size_new) + let size = sizeFormate(file.size_new[0]) types.push({ type: 'master', size }) _types.master = { size, diff --git a/src/utils/musicSdk/tx/musicInfo.js b/src/utils/musicSdk/tx/musicInfo.js index 7d9389c..33fb8b6 100644 --- a/src/utils/musicSdk/tx/musicInfo.js +++ b/src/utils/musicSdk/tx/musicInfo.js @@ -69,7 +69,7 @@ export default (songmid) => { } } if (file.size_new[0] !== 0) { - let size = sizeFormate(file.size_new) + let size = sizeFormate(file.size_new[0]) types.push({ type: 'master', size }) _types.master = { size, diff --git a/src/utils/musicSdk/tx/musicSearch.js b/src/utils/musicSdk/tx/musicSearch.js index 07496ea..7565369 100644 --- a/src/utils/musicSdk/tx/musicSearch.js +++ b/src/utils/musicSdk/tx/musicSearch.js @@ -87,7 +87,7 @@ export default { } } if (file.size_new[0] !== 0) { - let size = sizeFormate(file.size_new) + let size = sizeFormate(file.size_new[0]) types.push({ type: 'master', size }) _types.master = { size, diff --git a/src/utils/musicSdk/tx/songList.js b/src/utils/musicSdk/tx/songList.js index 3885e85..68702f8 100644 --- a/src/utils/musicSdk/tx/songList.js +++ b/src/utils/musicSdk/tx/songList.js @@ -259,7 +259,7 @@ export default { } } if (file.size_new[0] !== 0) { - let size = sizeFormate(file.size_new) + let size = sizeFormate(file.size_new[0]) types.push({ type: 'master', size }) _types.master = { size,