Skip to content

Commit 1b22abc

Browse files
committed
优化版本号对比机制
1 parent f85c831 commit 1b22abc

5 files changed

Lines changed: 13 additions & 7 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lx-music-desktop",
3-
"version": "0.15.0",
3+
"version": "0.16.0",
44
"description": "一个免费的音乐下载助手",
55
"main": "./dist/electron/main.js",
66
"productName": "lx-music-desktop",

src/renderer/App.vue

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,14 @@ export default {
229229
this.setNewVersion(result)
230230
return result
231231
}).then(result => {
232-
if (result.version === this.version.version || result.version === this.setting.ignoreVersion) return
232+
let newVer = result.version.replace(/\./g, '')
233+
let currentVer = this.version.version.replace(/\./g, '')
234+
let len = Math.max(newVer.length, currentVer.length)
235+
newVer.padStart(len, '0')
236+
currentVer.padStart(len, '0')
237+
if (parseInt(newVer) <= parseInt(currentVer)) return this.setVersionModalVisible({ isLatestVer: true })
238+
239+
if (result.version === this.setting.ignoreVersion) return
233240
// console.log(this.version)
234241
this.$nextTick(() => {
235242
this.setVersionModalVisible({ isShow: true })

src/renderer/store/mutations.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ export default {
3030
setDownloadProgress(state, info) {
3131
state.version.downloadProgress = info
3232
},
33-
setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isDownloading, isUnknow }) {
33+
setVersionModalVisible(state, { isShow, isError, isDownloaded, isTimeOut, isDownloading, isUnknow, isLatestVer }) {
3434
if (isShow !== undefined) state.version.showModal = isShow
3535
if (isError !== undefined) state.version.isError = isError
3636
if (isTimeOut !== undefined) state.version.isTimeOut = isTimeOut
3737
if (isDownloading !== undefined) state.version.isDownloading = isDownloading
3838
if (isDownloaded !== undefined) state.version.isDownloaded = isDownloaded
3939
if (isUnknow !== undefined) state.version.isUnknow = isUnknow
40+
if (isLatestVer !== undefined) state.version.isLatestVer = isLatestVer
4041
},
4142
setVolume(state, val) {
4243
state.setting.player.volume = val

src/renderer/store/state.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ export default {
9292
isUnknow: false,
9393
isDownloaded: false,
9494
isDownloading: false,
95+
isLatestVer: false,
9596
downloadProgress: null,
9697
},
9798
userInfo: null,

src/renderer/views/Setting.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ div.scroll(:class="$style.setting")
130130
br
131131
| 下载进度:{{downloadProgress}}
132132
p(v-if="version.newVersion")
133-
span(v-if="isLatestVer") 软件已是最新,尽情地体验吧~🥂
133+
span(v-if="version.isLatestVer") 软件已是最新,尽情地体验吧~🥂
134134
material-btn(v-else :class="[$style.btn, $style.gapLeft]" min @click="showUpdateModal") 打开更新窗口 🚀
135135
p.small(v-else) 检查更新中...
136136
dt 关于洛雪音乐
@@ -209,9 +209,6 @@ export default {
209209
computed: {
210210
...mapGetters(['setting', 'settingVersion', 'themes', 'version', 'windowSizeList']),
211211
...mapGetters('list', ['defaultList', 'loveList']),
212-
isLatestVer() {
213-
return this.version.newVersion && this.version.version === this.version.newVersion.version
214-
},
215212
isShowRebootBtn() {
216213
return this.current_setting.windowSizeId != window.currentWindowSizeId
217214
},

0 commit comments

Comments
 (0)