新增音源别名

pull/166/head
lyswhut 2020-03-13 16:16:42 +08:00
parent ba1a981c87
commit 4f06fe45d3
12 changed files with 74 additions and 21 deletions

View File

@ -7,21 +7,14 @@ module.exports = {
rootValue: 16, rootValue: 16,
unitPrecision: 5, unitPrecision: 5,
propList: [ propList: [
'font', 'font', 'font-size',
'font-size',
'line-height', 'line-height',
'letter-spacing', 'letter-spacing',
'padding', 'margin', 'padding', 'margin',
'height', 'height', 'width',
'width', 'max-width', 'max-height',
'max-width', 'min-width', 'min-height',
'max-height', 'top', 'left', 'bottom', 'right',
'min-width',
'min-height',
'top',
'left',
'bottom',
'right',
'border-radius', 'border-radius',
], ],
selectorBlackList: ['html'], selectorBlackList: ['html'],

View File

@ -5,6 +5,7 @@
- 新增启动参数`search`,使用例子:`.\lx-music-desktop.exe -search="突然的自我 - 伍佰"` - 新增启动参数`search`,使用例子:`.\lx-music-desktop.exe -search="突然的自我 - 伍佰"`
- 新增音频输出设置 - 新增音频输出设置
- 新增软件内的包括字体在内的界面内容大小调整,现在当窗口大小切换到“较小/大/较大”时,软件内的元素将会适当减小或加大,窗口大小的“小”与“中”内的元素将保持之前的大小暂不做改变 - 新增软件内的包括字体在内的界面内容大小调整,现在当窗口大小切换到“较小/大/较大”时,软件内的元素将会适当减小或加大,窗口大小的“小”与“中”内的元素将保持之前的大小暂不做改变
- 新增音源别名,默认将显示别名,想要显示回原名可到设置切换(免责声明:别名仅是本软件用于描述各音源的标签,其名字归版权方所有)
### 优化 ### 优化

View File

@ -95,6 +95,7 @@ export default {
.list { .list {
position: absolute; position: absolute;
width: 100%;
top: 100%; top: 100%;
left: 0; left: 0;
border-bottom: 2px solid @color-tab-border-bottom; border-bottom: 2px solid @color-tab-border-bottom;

View File

@ -17,5 +17,14 @@
"source_mg": "咪咕音乐", "source_mg": "咪咕音乐",
"source_bd": "百度音乐", "source_bd": "百度音乐",
"source_all": "聚合搜索" "source_all": "聚合搜索",
"source_alias_kw": "小蜗音乐",
"source_alias_kg": "小枸音乐",
"source_alias_tx": "小秋音乐",
"source_alias_wy": "小芸音乐",
"source_alias_mg": "小蜜音乐",
"source_alias_bd": "小杜音乐",
"source_alias_all": "聚合大会"
} }

View File

@ -7,6 +7,10 @@
"basic_source_test": "测试接口(几乎软件的所有功能都可用)", "basic_source_test": "测试接口(几乎软件的所有功能都可用)",
"basic_source_temp": "临时接口(软件的某些功能不可用,建议测试接口不可用再使用本接口)", "basic_source_temp": "临时接口(软件的某些功能不可用,建议测试接口不可用再使用本接口)",
"basic_source": "音乐来源", "basic_source": "音乐来源",
"basic_sourcename_title": "选择音源名字类型",
"basic_sourcename_real": "原名",
"basic_sourcename_alias": "别名",
"basic_sourcename": "音源名字",
"basic_window_size_title": "设置软件窗口尺寸", "basic_window_size_title": "设置软件窗口尺寸",
"basic_window_size": "窗口尺寸", "basic_window_size": "窗口尺寸",
"basic_window_size_smaller": "较小", "basic_window_size_smaller": "较小",

View File

@ -15,5 +15,12 @@
"source_wy": "網易音樂", "source_wy": "網易音樂",
"source_mg": "咪咕音樂", "source_mg": "咪咕音樂",
"source_bd": "百度音樂", "source_bd": "百度音樂",
"source_all": "聚合搜索" "source_all": "聚合搜索",
"source_alias_kw": "小蝸音樂",
"source_alias_kg": "小枸音樂",
"source_alias_tx": "小秋音樂",
"source_alias_wy": "小芸音樂",
"source_alias_mg": "小蜜音樂",
"source_alias_bd": "小杜音樂",
"source_alias_all": "聚合大會"
} }

View File

@ -7,6 +7,10 @@
"basic_source_test": "測試接口(幾乎軟件的所有功能都可用)", "basic_source_test": "測試接口(幾乎軟件的所有功能都可用)",
"basic_source_temp": "臨時接口(軟件的某些功能不可用,建議測試接口不可用再使用本接口)", "basic_source_temp": "臨時接口(軟件的某些功能不可用,建議測試接口不可用再使用本接口)",
"basic_source": "音樂來源", "basic_source": "音樂來源",
"basic_sourcename_title": "選擇音源名字類型",
"basic_sourcename_real": "原名",
"basic_sourcename_alias": "別名",
"basic_sourcename": "音源名字",
"basic_window_size_title": "設置軟件窗口尺寸", "basic_window_size_title": "設置軟件窗口尺寸",
"basic_window_size": "窗口尺寸", "basic_window_size": "窗口尺寸",
"basic_window_size_smaller": "較小", "basic_window_size_smaller": "較小",

View File

@ -16,5 +16,14 @@
"source_wy": "Netease", "source_wy": "Netease",
"source_mg": "Migu", "source_mg": "Migu",
"source_bd": "Baidu", "source_bd": "Baidu",
"source_all": "Aggregated" "source_all": "Aggregated",
"source_alias_kw": "KW Music",
"source_alias_kg": "KG Music",
"source_alias_tx": "TX Music",
"source_alias_wy": "WY Music",
"source_alias_mg": "MG Music",
"source_alias_bd": "BD Music",
"source_alias_all": "Aggregated"
} }

View File

@ -7,6 +7,10 @@
"basic_source_test": "test interface (almost all functions of the software are available)", "basic_source_test": "test interface (almost all functions of the software are available)",
"basic_source_temp": "temp interface (some functions are not available, it is recommended to use this interface if the test interface is unavailable)", "basic_source_temp": "temp interface (some functions are not available, it is recommended to use this interface if the test interface is unavailable)",
"basic_source": "Music source", "basic_source": "Music source",
"basic_sourcename_title": "Select the source name type",
"basic_sourcename_real": "Original",
"basic_sourcename_alias": "Alias",
"basic_sourcename": "Source Name",
"basic_window_size_title": "Set software window size", "basic_window_size_title": "Set software window size",
"basic_window_size": "Window size", "basic_window_size": "Window size",
"basic_window_size_smaller": "smaller", "basic_window_size_smaller": "smaller",

View File

@ -12,20 +12,22 @@ export default {
}, },
source(state) { source(state) {
const source = music.sources.find(s => s.id === state.setting.sourceId) || music.sources[0] const source = music.sources.find(s => s.id === state.setting.sourceId) || music.sources[0]
return { id: source.id, name: window.i18n.t('store.state.source_' + source.id) } return source
}, },
sources(state) { sources(state) {
return { return {
active: state.setting.sourceId, active: state.setting.sourceId,
list: music.sources.map(item => ({ id: item.id, name: window.i18n.t('store.state.source_' + item.id) })), list: music.sources,
} }
}, },
sourceNames() { sourceNames(state) {
let prefix = 'store.state.source_'
if (state.setting.sourceNameType == 'alias') prefix += 'alias_'
const sources = {} const sources = {}
for (const source of music.sources) { for (const source of music.sources) {
sources[source.id] = window.i18n.t('store.state.source_' + source.id) sources[source.id] = window.i18n.t(prefix + source.id)
} }
sources.all = window.i18n.t('store.state.source_all') sources.all = window.i18n.t(prefix + 'all')
return sources return sources
}, },
userInfo(state) { userInfo(state) {

View File

@ -177,7 +177,7 @@ export const isChildren = (parent, children) => {
* @param {*} setting * @param {*} setting
*/ */
export const updateSetting = (setting, version) => { export const updateSetting = (setting, version) => {
const defaultVersion = '1.0.17' const defaultVersion = '1.0.18'
if (!version) { if (!version) {
if (setting) { if (setting) {
version = setting.version version = setting.version
@ -241,6 +241,7 @@ export const updateSetting = (setting, version) => {
langId: 'cns', langId: 'cns',
sourceId: 'kw', sourceId: 'kw',
apiSource: 'temp', apiSource: 'temp',
sourceNameType: 'alias',
randomAnimate: true, randomAnimate: true,
ignoreVersion: null, ignoreVersion: null,
} }

View File

@ -35,6 +35,12 @@ div.scroll(:class="$style.setting")
@change="handleLangChange(item.locale)" :class="$style.gapLeft" @change="handleLangChange(item.locale)" :class="$style.gapLeft"
need v-model="current_setting.langId" :value="item.locale" :label="item.name") need v-model="current_setting.langId" :value="item.locale" :label="item.name")
dd(:title="$t('view.setting.basic_sourcename_title')")
h3 {{$t('view.setting.basic_sourcename')}}
div
material-checkbox(v-for="item in sourceNameTypes" :key="item.id" :class="$style.gapLeft" :id="`setting_abasic_sourcename_${item.id}`"
name="setting_basic_sourcename" need v-model="current_setting.sourceNameType" :value="item.id" :label="item.label")
dt {{$t('view.setting.play')}} dt {{$t('view.setting.play')}}
dd(:title="$t('view.setting.play_toggle_title')") dd(:title="$t('view.setting.play_toggle_title')")
h3 {{$t('view.setting.play_toggle')}} h3 {{$t('view.setting.play_toggle')}}
@ -268,6 +274,18 @@ export default {
}, },
] ]
}, },
sourceNameTypes() {
return [
{
id: 'real',
label: this.$t('view.setting.basic_sourcename_real'),
},
{
id: 'alias',
label: this.$t('view.setting.basic_sourcename_alias'),
},
]
},
musicNames() { musicNames() {
return [ return [
{ {