diff --git a/CHANGELOG.md b/CHANGELOG.md index 7c2d72c61c..c10bc96b2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,13 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/). Commit convention is based on [Conventional Commits](http://conventionalcommits.org). Change log format is based on [Keep a Changelog](http://keepachangelog.com/). +## [0.2.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.1...v0.2.2) - 2019-08-21 + +### 修复 + +- 修复下载过程中出错重试5次都失败后不会自动开始下一个任务的Bug +- 修复播放到一半URL过期时不会刷新URL直接播放下一首的问题 + ## [0.2.1](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.0...v0.2.1) - 2019-08-20 ### 优化 diff --git a/package.json b/package.json index fd67fd81c7..16d0608ee2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.2.1", + "version": "0.2.2", "description": "一个免费的音乐下载助手", "main": "./dist/electron/main.js", "scripts": { diff --git a/publish/changeLog.md b/publish/changeLog.md index 8df9a59932..d6330063fe 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,4 +1,4 @@ ### 修复 - 修复下载过程中出错重试5次都失败后不会自动开始下一个任务的Bug - +- 修复播放到一半URL过期时不会刷新URL直接播放下一首的问题 diff --git a/publish/version.json b/publish/version.json index 2816d83969..46bed0b8e2 100644 --- a/publish/version.json +++ b/publish/version.json @@ -1,7 +1,11 @@ { - "version": "0.2.1", - "desc": "

优化

\n\n

修复

\n\n", + "version": "0.2.2", + "desc": "

修复

\n\n", "history": [ + { + "version": "0.2.1", + "desc": "

优化

\n\n

修复

\n\n" + }, { "version": "0.2.0", "desc": "

新增

\n\n

修复

\n\n" diff --git a/src/renderer/App.vue b/src/renderer/App.vue index c7efad514f..e472b92290 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -111,7 +111,7 @@ export default { }, initPlayList() { let defaultList = this.electronStore.get('list.defaultList') - console.log(defaultList) + // console.log(defaultList) if (defaultList) { // defaultList.list.forEach(m => { // m.typeUrl = {} diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index f99861467d..96398cc51d 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -70,6 +70,7 @@ export default { line: 0, }, delayNextTimeout: null, + audioErrorTime: 0, // retryNum: 0, } }, @@ -174,8 +175,9 @@ export default { // console.log('code', this.audio.error.code) if (!this.musicInfo.songmid) return console.log('出错') - if (this.audio.error.code == 4 && this.retryNum < 3) { // 若音频URL无效则尝试刷新3次URL + if (this.audio.error.code !== 1 && this.retryNum < 3) { // 若音频URL无效则尝试刷新3次URL // console.log(this.retryNum) + this.audioErrorTime = this.audio.currentTime // 记录出错的播放时间 this.retryNum++ this.setUrl(this.list[this.playIndex], true) return @@ -203,6 +205,10 @@ export default { }) this.audio.addEventListener('loadeddata', () => { this.maxPlayTime = this.audio.duration + if (this.audioErrorTime) { + this.audio.currentTime = this.audioErrorTime + this.audioErrorTime = 0 + } if (!this.targetSong.interval && this.listId != 'download') this.updateMusicInfo({ index: this.playIndex, data: { interval: formatPlayTime2(this.maxPlayTime) } }) this.status = '音乐加载中...' }) @@ -249,6 +255,7 @@ export default { this.checkDelayNextTimeout() let targetSong = this.targetSong = this.list[this.playIndex] this.retryNum = 0 + this.audioErrorTime = 0 if (this.listId == 'download') { if (!checkPath(targetSong.filePath) || !targetSong.isComplate || /\.ape$/.test(targetSong.filePath)) { @@ -369,12 +376,13 @@ export default { this.musicInfo.url = targetSong.typeUrl[type] this.status = '歌曲链接获取中...' - this.getUrl({ musicInfo: targetSong, type, isRefresh }).then(() => { + return this.getUrl({ musicInfo: targetSong, type, isRefresh }).then(() => { this.audio.src = this.musicInfo.url = targetSong.typeUrl[type] }).catch(err => { if (err.message == requestMsg.cancelRequest) return this.status = err.message this.addDelayNextTimeout() + return Promise.reject(err) }) }, setImg(targetSong) {