From 2cabe6e58e570e356dce6afa1749e7f48ad33965 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 18:49:24 +0800 Subject: [PATCH 01/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=9C=BA=E5=88=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 2 +- src/main/rendererEvents/winEvent.js | 3 ++ src/renderer/config/bindkey.js | 58 ++++++++++++++--------------- src/renderer/config/event.js | 11 ++++++ src/renderer/main.js | 8 +--- 5 files changed, 45 insertions(+), 37 deletions(-) create mode 100644 src/renderer/config/event.js diff --git a/publish/changeLog.md b/publish/changeLog.md index 105616e8..90a434e3 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,3 @@ ### 修复 -- 修复开启托盘时，可能导致无法自动更新的问题 +- 修复按住`Ctrl`等键触发多选机制时不松开按键的情况下切换到其他窗口后再松开按键，这时切回软件不按按键都处在多选模式的问题 diff --git a/src/main/rendererEvents/winEvent.js b/src/main/rendererEvents/winEvent.js index 5bbd0139..35d0df1f 100644 --- a/src/main/rendererEvents/winEvent.js +++ b/src/main/rendererEvents/winEvent.js @@ -21,6 +21,9 @@ module.exports = mainWindow => { // mainWindow.on('restore', () => { // mainWindow.webContents.send('restore') // }) + mainWindow.on('focus', () => { + mainWindow.webContents.send('focus') + }) mainWindow.once('ready-to-show', () => { mainWindow.show() diff --git a/src/renderer/config/bindkey.js b/src/renderer/config/bindkey.js index 9eb16f47..eaddc52d 100644 --- a/src/renderer/config/bindkey.js +++ b/src/renderer/config/bindkey.js @@ -1,41 +1,38 @@ import mousetrap from 'mousetrap' + let eventHub +const bindKeys = [ + 'shift', + 'mod', + 'mod+a', +] + const bindKey = () => { mousetrap.reset() - mousetrap.bind('shift', (event, combo) => { - eventHub.$emit('key_shift_down', { event, combo }) - return false - }, 'keydown') - mousetrap.bind('shift', (event, combo) => { - eventHub.$emit('key_shift_up', { event, combo }) - return false - }, 'keyup') - mousetrap.bind('mod', (event, combo) => { - eventHub.$emit('key_mod_down', { event, combo }) - return false - }, 'keydown') - mousetrap.bind('mod', (event, combo) => { - eventHub.$emit('key_mod_up', { event, combo }) - return false - }, 'keyup') - mousetrap.bind('mod+a', (event, combo) => { - eventHub.$emit('key_mod+a_down', { event, combo }) - return false - }, 'keydown') - mousetrap.bind('mod+a', (event, combo) => { - eventHub.$emit('key_mod+a_up', { event, combo }) - return false - }, 'keyup') + for (const key of bindKeys) { + mousetrap.bind(key, (event, combo) => { + eventHub.$emit(`key_${key}_down`, { event, combo }) + return false + }, 'keydown') + mousetrap.bind(key, (event, combo) => { + eventHub.$emit(`key_${key}_up`, { event, combo }) + return false + }, 'keyup') + } } const unbindKey = () => { - mousetrap.unbind('shift', 'keydown') - mousetrap.unbind('shift', 'keyup') - mousetrap.unbind('mod', 'keydown') - mousetrap.unbind('mod', 'keyup') - mousetrap.unbind('mod+a', 'keydown') - mousetrap.unbind('mod+a', 'keyup') + for (const key of bindKeys) { + mousetrap.unbind(key, 'keydown') + mousetrap.unbind(key, 'keyup') + } +} + +const handleFocus = () => { + for (const key of bindKeys) { + eventHub.$emit(`key_${key}_up`, { combo: key }) + } } export default () => { @@ -43,4 +40,5 @@ export default () => { eventHub.$on('bindKey', bindKey) eventHub.$on('unbindKey', unbindKey) + eventHub.$on('focus', handleFocus) } diff --git a/src/renderer/config/event.js b/src/renderer/config/event.js new file mode 100644 index 00000000..e4e0cb6d --- /dev/null +++ b/src/renderer/config/event.js @@ -0,0 +1,11 @@ +import Vue from 'vue' +import bindkey from './bindkey' +import { rendererOn } from '../../common/ipc' + +window.eventHub = new Vue() + +bindkey() + +rendererOn('focus', () => { + window.eventHub.$emit('focus') +}) diff --git a/src/renderer/main.js b/src/renderer/main.js index bfc2085f..d2791bc8 100644 --- a/src/renderer/main.js +++ b/src/renderer/main.js @@ -1,6 +1,8 @@ import Vue from 'vue' import { sync } from 'vuex-router-sync' +import './config/event' + // Components import './components' @@ -14,14 +16,8 @@ import store from './store' import '../common/error' -import bindkey from './config/bindkey' - sync(store, router) -window.eventHub = new Vue() - -bindkey() - Vue.config.productionTip = false new Vue({ From aa8764068796e0011c0f10e9743dc830e6b0db3f Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 20:01:36 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLinux=E7=89=88=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E6=89=98=E7=9B=98=E6=97=A0=E6=B3=95=E9=80=80=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/main/rendererEvents/winEvent.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 90a434e3..743d506b 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,4 @@ ### 修复 - 修复按住`Ctrl`等键触发多选机制时不松开按键的情况下切换到其他窗口后再松开按键，这时切回软件不按按键都处在多选模式的问题 +- 修复Linux版开启托盘无法退出的问题 diff --git a/src/main/rendererEvents/winEvent.js b/src/main/rendererEvents/winEvent.js index 35d0df1f..42957e21 100644 --- a/src/main/rendererEvents/winEvent.js +++ b/src/main/rendererEvents/winEvent.js @@ -1,10 +1,10 @@ -const { isMac } = require('../../common/utils') +const { isWin } = require('../../common/utils') global.isQuitting = false global.isTrafficLightClose = false // 是否点击软件上的关闭按钮关闭 module.exports = mainWindow => { mainWindow.on('close', event => { - if (global.isQuitting || !global.appSetting.tray.isToTray || (isMac && !global.isTrafficLightClose)) { + if (global.isQuitting || !global.appSetting.tray.isToTray || (!isWin && !global.isTrafficLightClose)) { mainWindow.setProgressBar(-1) return } From 7cc373c07f0814ffd03696f1689e12bc3b7ecd57 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 20:03:07 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cc33d169..dc33ff53 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.18.2", + "version": "0.18.3", "description": "一个免费的音乐下载助手", "main": "./dist/electron/main.js", "productName": "lx-music-desktop", From db9dc18118a6f17dac7ce4f8cc6c2fcd3b40606a Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 20:10:53 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E4=B8=BAappImage=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index dc33ff53..272fcc40 100644 --- a/package.json +++ b/package.json @@ -116,7 +116,8 @@ }, "appImage": { "license": "./licenses/license_zh.txt", - "category": "Utility;AudioVideo;Audio;Player;Music;" + "category": "Utility;AudioVideo;Audio;Player;Music;", + "icon": "./resources/icons" }, "publish": [ { From bd8b8d5b64a51f3a155a21c81d09372d299b4b44 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 20:22:05 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 272fcc40..da507571 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,9 @@ "appImage": { "license": "./licenses/license_zh.txt", "category": "Utility;AudioVideo;Audio;Player;Music;", - "icon": "./resources/icons" + "desktop": { + "icon": "./resources/icons/512x512.png" + } }, "publish": [ { From 33e6202835c56d65b372930dffa1cd26b0da1042 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 20:42:53 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E6=96=B0=E5=A2=9Erpm=E3=80=81pacman?= =?UTF-8?q?=E5=8C=85=E7=9A=84=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 9 ++++----- publish/changeLog.md | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index da507571..25854131 100644 --- a/package.json +++ b/package.json @@ -32,11 +32,13 @@ "publish:mac": "npm run publish:mac:dmg", "publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft", "publish:gh:linux": "node build-config/pack.js && npm run publish:linux", - "publish:linux": "npm run publish:linux:deb && npm run publish:linux:appImage", + "publish:linux": "npm run publish:linux:deb && npm run publish:linux:appImage && npm run publish:linux:rpm && npm run publish:linux:pacman", "publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft", "publish:linux:deb": "npm run publish:linux:deb:x64 && npm run publish:linux:deb:x86", "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft", "publish:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32 -p onTagOrDraft", + "publish:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm -p onTagOrDraft", + "publish:linux:pacman": "cross-env ARCH=x86 electron-builder -l=pacman -p onTagOrDraft", "pack:linux": "node build-config/pack.js && electron-builder -l", "pack:mac": "node build-config/pack.js && electron-builder -m=dmg", "pack:dir": "node build-config/pack.js && electron-builder --dir", @@ -116,10 +118,7 @@ }, "appImage": { "license": "./licenses/license_zh.txt", - "category": "Utility;AudioVideo;Audio;Player;Music;", - "desktop": { - "icon": "./resources/icons/512x512.png" - } + "category": "Utility;AudioVideo;Audio;Player;Music;" }, "publish": [ { diff --git a/publish/changeLog.md b/publish/changeLog.md index 743d506b..ae7c46a4 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,3 +1,7 @@ +### 新增 + +- 新增`rpm`、`pacman`包的打包 + ### 修复 - 修复按住`Ctrl`等键触发多选机制时不松开按键的情况下切换到其他窗口后再松开按键，这时切回软件不按按键都处在多选模式的问题 From e382ccff9bf8013ec8ade6cf7ff162371f980ac6 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 20:57:48 +0800 Subject: [PATCH 07/14] =?UTF-8?q?=E5=AE=89=E8=A3=85rpm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index b14318c0..71725bc6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,11 @@ matrix: - os: linux dist: trusty + sudo: required + addons: + apt: + packages: + - rpm cache: directories: From 1de84c66d65f25a8ac051780369ebf96399c94fa Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 21:15:34 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 71725bc6..1b769478 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,9 @@ matrix: addons: apt: packages: + - libopenjp2-tools - rpm + - bsdtar cache: directories: From 7f02b85eb8eeb7d2a8ee92942647ebc461e95576 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 21:20:28 +0800 Subject: [PATCH 09/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1b769478..7284625e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ matrix: addons: apt: packages: - - libopenjp2-tools - rpm - bsdtar From eff49af00c37aa785b464435ebe8f0c29a4e68e8 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 2 May 2020 21:37:54 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=9E=84=E5=BB=BA=20x6?= =?UTF-8?q?4=20pacman=20=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 25854131..3c864192 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft", "publish:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32 -p onTagOrDraft", "publish:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm -p onTagOrDraft", - "publish:linux:pacman": "cross-env ARCH=x86 electron-builder -l=pacman -p onTagOrDraft", + "publish:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman -p onTagOrDraft", "pack:linux": "node build-config/pack.js && electron-builder -l", "pack:mac": "node build-config/pack.js && electron-builder -m=dmg", "pack:dir": "node build-config/pack.js && electron-builder --dir", From 685e34bc83a85d2fee8cdf59ddd8f4d9486ecb97 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 3 May 2020 12:30:29 +0800 Subject: [PATCH 11/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=8F=AF=E8=83=BD=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=E9=9F=B3=E6=BA=90=E8=BE=93=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/renderer/components/core/Player.vue | 6 +++--- src/renderer/views/Setting.vue | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index ae7c46a4..470251ed 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -6,3 +6,4 @@ - 修复按住`Ctrl`等键触发多选机制时不松开按键的情况下切换到其他窗口后再松开按键，这时切回软件不按按键都处在多选模式的问题 - 修复Linux版开启托盘无法退出的问题 +- 修复某些情况下可能导致的音源输出问题 diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index 53712a06..25de8e8a 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -617,12 +617,12 @@ export default { }, async setMediaDevice() { let mediaDeviceId = this.setting.player.mediaDeviceId - if (!mediaDeviceId) return const devices = await navigator.mediaDevices.enumerateDevices() let device = devices.find(device => device.deviceId === mediaDeviceId) - if (!device) return this.setMediaDeviceId('default') + const deviceId = device ? device.deviceId : 'default' + // console.log(device) - this.audio.setSinkId(device.deviceId).catch((err) => { + this.audio.setSinkId(deviceId).catch(err => { console.log(err) this.setMediaDeviceId('default') }) diff --git a/src/renderer/views/Setting.vue b/src/renderer/views/Setting.vue index f48c8bab..004129b0 100644 --- a/src/renderer/views/Setting.vue +++ b/src/renderer/views/Setting.vue @@ -614,7 +614,9 @@ export default { }, async getMediaDevice() { const devices = await navigator.mediaDevices.enumerateDevices() - const audioDevices = devices.filter(device => device.kind === 'audiooutput') + let audioDevices = devices.filter(device => device.kind === 'audiooutput') + let currentId = this.current_setting.player.mediaDeviceId + if (!audioDevices.some(device => device.deviceId === currentId)) this.current_setting.player.mediaDeviceId = 'default' this.mediaDevices = audioDevices // console.log(this.mediaDevices) }, From 6aec78e15303a26764cbb7deebfa1f691c930bcc Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sun, 3 May 2020 12:49:57 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/index.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/index.js b/src/main/index.js index 979e5c9f..022e0154 100644 --- a/src/main/index.js +++ b/src/main/index.js @@ -22,6 +22,18 @@ app.on('second-instance', (event, argv, cwd) => { const isDev = global.isDev = process.env.NODE_ENV !== 'production' const { navigationUrlWhiteList } = require('../common/config') +const { getAppSetting, parseEnv, getWindowSizeInfo } = require('./utils') +const { isMac, isLinux } = require('../common/utils') + +global.envParams = parseEnv() + + +// https://github.com/electron/electron/issues/22691 +app.commandLine.appendSwitch('wm-window-animations-disabled') + +// https://github.com/electron/electron/issues/18397 +app.allowRendererProcessReuse = true + app.on('web-contents-created', (event, contents) => { contents.on('will-navigate', (event, navigationUrl) => { @@ -50,22 +62,12 @@ app.on('web-contents-created', (event, contents) => { }) }) -// https://github.com/electron/electron/issues/22691 -app.commandLine.appendSwitch('wm-window-animations-disabled') - -// https://github.com/electron/electron/issues/18397 -app.allowRendererProcessReuse = !isDev - -const { getAppSetting, parseEnv, getWindowSizeInfo } = require('./utils') - -global.envParams = parseEnv() require('../common/error') require('./events') require('./rendererEvents') const winEvent = require('./rendererEvents/winEvent') const autoUpdate = require('./utils/autoUpdate') -const { isMac, isLinux } = require('../common/utils') let winURL From 7e029b54950ecbbc62698b8f3ee2cd38fac5f34f Mon Sep 17 00:00:00 2001 From: lyswhut Date: Mon, 4 May 2020 01:53:37 +0800 Subject: [PATCH 13/14] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=90=E4=BA=9B?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=97=A0=E6=B3=95=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 1 + src/renderer/store/modules/download.js | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 470251ed..3d6a8110 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -7,3 +7,4 @@ - 修复按住`Ctrl`等键触发多选机制时不松开按键的情况下切换到其他窗口后再松开按键，这时切回软件不按按键都处在多选模式的问题 - 修复Linux版开启托盘无法退出的问题 - 修复某些情况下可能导致的音源输出问题 +- 修复某些情况下无法开始下载任务的问题 diff --git a/src/renderer/store/modules/download.js b/src/renderer/store/modules/download.js index 4d7c5894..de8695eb 100644 --- a/src/renderer/store/modules/download.js +++ b/src/renderer/store/modules/download.js @@ -68,7 +68,7 @@ const getStartTask = (list, downloadStatus, maxDownloadNum) => { let downloadCount = 0 const waitList = list.filter(item => item.status == downloadStatus.WAITING ? true : (item.status === downloadStatus.RUN && ++downloadCount && false)) // console.log(downloadCount, waitList) - return downloadCount < maxDownloadNum && waitList.length > 0 && waitList.shift() + return downloadCount < maxDownloadNum ? waitList.shift() || null : false } const awaitRequestAnimationFrame = () => new Promise(resolve => window.requestAnimationFrame(() => resolve())) @@ -409,11 +409,14 @@ const actions = { async startTask({ state, rootState, commit, dispatch }, downloadInfo) { // 检查是否可以开始任务 let result = getStartTask(state.list, state.downloadStatus, rootState.setting.download.maxDownloadNum) - if (result) { - if (!downloadInfo || downloadInfo.isComplate || downloadInfo.status == state.downloadStatus.RUN) downloadInfo = result + if (downloadInfo && !downloadInfo.isComplate && downloadInfo.status != state.downloadStatus.RUN) { + if (result === false) { + commit('setStatus', { downloadInfo, status: state.downloadStatus.WAITING }) + return + } } else { - if (downloadInfo) commit('setStatus', { downloadInfo, status: state.downloadStatus.WAITING }) - return + if (!result) return + downloadInfo = result } let dl = dls[downloadInfo.key] From b76424ba9b4b7c6806e7364399c6a9b09f094110 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 6 May 2020 18:22:24 +0800 Subject: [PATCH 14/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE-?= =?UTF-8?q?=E5=88=97=E8=A1=A8-=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=AD=8C=E6=9B=B2=E6=BA=90=E7=9A=84=E9=BB=98=E8=AE=A4=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- publish/changeLog.md | 4 ++++ src/renderer/utils/index.js | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/publish/changeLog.md b/publish/changeLog.md index 3d6a8110..a42e6497 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -8,3 +8,7 @@ - 修复Linux版开启托盘无法退出的问题 - 修复某些情况下可能导致的音源输出问题 - 修复某些情况下无法开始下载任务的问题 + +### 更变 + +- 修改设置-列表-是否显示歌曲源的默认设置为选中（该变更不影响之前的设置） diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js index 974e75da..62bad9e2 100644 --- a/src/renderer/utils/index.js +++ b/src/renderer/utils/index.js @@ -201,7 +201,7 @@ export const updateSetting = (setting, version) => { }, list: { isShowAlbumName: true, - isShowSource: false, + isShowSource: true, scroll: { enable: true, locations: {},