diff --git a/package.json b/package.json index f5b43d05..6ef14ab3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "1.0.1", + "version": "1.1.0", "description": "一个免费的音乐下载助手", "main": "./dist/electron/main.js", "productName": "lx-music-desktop", diff --git a/publish/changeLog.md b/publish/changeLog.md index cb2a418f..ea930f10 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,8 +1,9 @@ ### 新增 -- 在歌单详情界面新增播放当前歌单按钮、收藏歌单按钮 +- 在歌单详情界面新增播放当前歌单按钮、收藏歌单按钮,注:播放歌单不会将歌曲添加到试听列表 - 新增`不允许将歌词窗口拖出主屏幕之外`的设置项,默认开启,在连接多个屏幕时想要拖动到其他屏幕时可关闭此设置 - 新增`显示歌词翻译`设置,默认开启,仅支持某些平台,注:无论该设置是否开启,嵌入或下载歌词时都不会带上翻译 +- 新增`显示切换动画`设置,默认开启,关闭时将基本禁用软件内的所有切换动画 ### 修复 @@ -22,4 +23,4 @@ ### 其他 -- 个性electron到 9.2.1 +- 更新electron到 9.2.1 diff --git a/src/common/defaultSetting.js b/src/common/defaultSetting.js index 37163597..72c9b3c0 100644 --- a/src/common/defaultSetting.js +++ b/src/common/defaultSetting.js @@ -3,7 +3,7 @@ const os = require('os') const { isMac } = require('./utils') const defaultSetting = { - version: '1.0.36', + version: '1.0.38', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -88,6 +88,7 @@ const defaultSetting = { sourceId: 'kw', apiSource: 'temp', sourceNameType: 'alias', + isShowAnimation: true, randomAnimate: true, ignoreVersion: null, isAgreePact: false, diff --git a/src/renderer-lyric/App.vue b/src/renderer-lyric/App.vue index a734428f..d77e9c38 100644 --- a/src/renderer-lyric/App.vue +++ b/src/renderer-lyric/App.vue @@ -119,7 +119,6 @@ export default { }, methods: { handleUpdateConfig({ config, languageId, isShowLyricTransition }) { - console.log(isShowLyricTransition) this.lrcConfig = config this.isShowLyricTransition = isShowLyricTransition if (this.$i18n.locale !== languageId && languageId != null) this.$i18n.locale = languageId diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 35b2fdcd..5defe753 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -135,6 +135,20 @@ export default { 'windowSizeActive.fontSize'(n) { document.documentElement.style.fontSize = n }, + 'setting.isShowAnimation': { + handler(n) { + if (n) { + if (document.body.classList.contains('disableAnimation')) { + document.body.classList.remove('disableAnimation') + } + } else { + if (!document.body.classList.contains('disableAnimation')) { + document.body.classList.add('disableAnimation') + } + } + }, + immediate: true, + }, }, methods: { ...mapActions(['getVersionInfo']), @@ -354,6 +368,11 @@ body { box-sizing: border-box; } +.disableAnimation * { + transition: none !important; + animation: none !important; +} + .transparent { padding: @shadow-app; #container { diff --git a/src/renderer/components/core/PlayerDetail.vue b/src/renderer/components/core/PlayerDetail.vue index 91773087..211fc528 100644 --- a/src/renderer/components/core/PlayerDetail.vue +++ b/src/renderer/components/core/PlayerDetail.vue @@ -526,7 +526,7 @@ export default { padding: 8px 0; line-height: 1.2; overflow-wrap: break-word; - transition: @transition-theme; + transition: @transition-theme !important; transition-property: color, font-size; } } diff --git a/src/renderer/lang/en-us/view/setting.json b/src/renderer/lang/en-us/view/setting.json index ec8ab69a..0b6a455f 100644 --- a/src/renderer/lang/en-us/view/setting.json +++ b/src/renderer/lang/en-us/view/setting.json @@ -1,6 +1,7 @@ { "basic": "General", "basic_theme": "Theme", + "basic_show_animation": "Show switching animation", "basic_animation_title": "Animation effect of the pop-up layer", "basic_animation": "Random pop-up animation", "basic_source_title": "Choose a music source", diff --git a/src/renderer/lang/zh-cn/view/setting.json b/src/renderer/lang/zh-cn/view/setting.json index d84c9073..8d4e2f80 100644 --- a/src/renderer/lang/zh-cn/view/setting.json +++ b/src/renderer/lang/zh-cn/view/setting.json @@ -3,6 +3,7 @@ "basic_theme": "主题颜色", "basic_animation_title": "弹出层的动画效果", "basic_animation": "弹出层随机动画", + "basic_show_animation": "显示切换动画", "basic_source_title": "选择音乐来源", "basic_source_test": "测试接口(几乎软件的所有功能都可用)", "basic_source_temp": "临时接口(软件的某些功能不可用,建议测试接口不可用再使用本接口)", diff --git a/src/renderer/lang/zh-tw/view/setting.json b/src/renderer/lang/zh-tw/view/setting.json index 9701fa8e..f5eecd1e 100644 --- a/src/renderer/lang/zh-tw/view/setting.json +++ b/src/renderer/lang/zh-tw/view/setting.json @@ -3,6 +3,7 @@ "basic_theme": "主題顏色", "basic_animation_title": "彈出層的動畫效果", "basic_animation": "彈出層隨機動畫", + "basic_show_animation": "顯示切換動畫", "basic_source_title": "選擇音樂來源", "basic_source_test": "測試接口(幾乎軟件的所有功能都可用)", "basic_source_temp": "臨時接口(軟件的某些功能不可用,建議測試接口不可用再使用本接口)", diff --git a/src/renderer/utils/music/xm/leaderboard.js b/src/renderer/utils/music/xm/leaderboard.js index fa28b59f..34dca4b1 100644 --- a/src/renderer/utils/music/xm/leaderboard.js +++ b/src/renderer/utils/music/xm/leaderboard.js @@ -78,7 +78,7 @@ export default { return arr.join('、') }, filterData(rawList) { - console.log(rawList) + // console.log(rawList) let ids = new Set() const list = [] rawList.forEach(songData => { diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue index 8a12effa..3e64b2c5 100644 --- a/src/renderer/views/Setting.vue +++ b/src/renderer/views/Setting.vue @@ -10,6 +10,11 @@ div.scroll(:class="$style.setting") span label {{$t('store.state.theme_' + theme.class)}} + dd + h3 {{$t('view.setting.basic_show_animation')}} + div + material-checkbox(id="setting_show_animate" v-model="current_setting.isShowAnimation" :label="$t('view.setting.is_show')") + dd(:title="$t('view.setting.basic_animation_title')") h3 {{$t('view.setting.basic_animation')}} div @@ -454,6 +459,7 @@ export default { langId: 'cns', themeId: 0, sourceId: 0, + isShowAnimation: true, randomAnimate: true, isAgreePact: false, controlBtnPosition: 'left',