优化版本号对比机制

pull/166/head
lyswhut 2020-02-15 21:02:47 +08:00
parent f85c83169d
commit 1b22abcd50
5 changed files with 13 additions and 7 deletions

View File

@ -1,6 +1,6 @@
{
"name": "lx-music-desktop",
"version": "0.15.0",
"version": "0.16.0",
"description": "一个免费的音乐下载助手",
"main": "./dist/electron/main.js",
"productName": "lx-music-desktop",

View File

@ -229,7 +229,14 @@ export default {
this.setNewVersion(result)
return result
}).then(result => {
if (result.version === this.version.version || result.version === this.setting.ignoreVersion) return
let newVer = result.version.replace(/\./g, '')
let currentVer = this.version.version.replace(/\./g, '')
let len = Math.max(newVer.length, currentVer.length)
newVer.padStart(len, '0')
currentVer.padStart(len, '0')
if (parseInt(newVer) <= parseInt(currentVer)) return this.setVersionModalVisible({ isLatestVer: true })
if (result.version === this.setting.ignoreVersion) return
// console.log(this.version)
this.$nextTick(() => {
this.setVersionModalVisible({ isShow: true })

View File

@ -30,13 +30,14 @@ export default {
setDownloadProgress(state, info) {
state.version.downloadProgress = info
},
setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isDownloading, isUnknow }) {
setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isDownloading, isUnknow, isLatestVer }) {
if (isShow !== undefined) state.version.showModal = isShow
if (isError !== undefined) state.version.isError = isError
if (isTimeOut !== undefined) state.version.isTimeOut = isTimeOut
if (isDownloading !== undefined) state.version.isDownloading = isDownloading
if (isDownloaded !== undefined) state.version.isDownloaded = isDownloaded
if (isUnknow !== undefined) state.version.isUnknow = isUnknow
if (isLatestVer !== undefined) state.version.isLatestVer = isLatestVer
},
setVolume(state, val) {
state.setting.player.volume = val

View File

@ -92,6 +92,7 @@ export default {
isUnknow: false,
isDownloaded: false,
isDownloading: false,
isLatestVer: false,
downloadProgress: null,
},
userInfo: null,

View File

@ -130,7 +130,7 @@ div.scroll(:class="$style.setting")
br
| 下载进度{{downloadProgress}}
p(v-if="version.newVersion")
span(v-if="isLatestVer") 软件已是最新尽情地体验吧~🥂
span(v-if="version.isLatestVer") 软件已是最新尽情地体验吧~🥂
material-btn(v-else :class="[$style.btn, $style.gapLeft]" min @click="showUpdateModal") 打开更新窗口 🚀
p.small(v-else) 检查更新中...
dt 关于洛雪音乐
@ -209,9 +209,6 @@ export default {
computed: {
...mapGetters(['setting', 'settingVersion', 'themes', 'version', 'windowSizeList']),
...mapGetters('list', ['defaultList', 'loveList']),
isLatestVer() {
return this.version.newVersion && this.version.version === this.version.newVersion.version
},
isShowRebootBtn() {
return this.current_setting.windowSizeId != window.currentWindowSizeId
},