From 6f733ea76d6ad805bc4c11f480f3bd07afc5615a Mon Sep 17 00:00:00 2001 From: viarotel Date: Thu, 12 Oct 2023 09:10:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0=E5=A4=B1=E8=B4=A5=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ipc/updater/index.js | 3 +- src/renderer/src/App.vue | 2 +- src/renderer/src/components/AboutUs/index.vue | 44 ++++++++++++++----- 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/main/ipc/updater/index.js b/src/main/ipc/updater/index.js index 137b5da..7f8386a 100644 --- a/src/main/ipc/updater/index.js +++ b/src/main/ipc/updater/index.js @@ -41,7 +41,8 @@ export default (mainWindow) => { autoUpdater.autoDownload = false // 检测下载错误 autoUpdater.on('error', (error) => { - console.error('update-error', error) + console.error('update-error') + mainWindow.webContents.send('update-error', error) }) // 检测是否需要更新 diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue index 0b5d920..5d1177f 100644 --- a/src/renderer/src/App.vue +++ b/src/renderer/src/App.vue @@ -37,7 +37,7 @@ export default { prop: 'Advanced', }, { - label: '关于我们', + label: '关于', prop: 'AboutUs', }, ], diff --git a/src/renderer/src/components/AboutUs/index.vue b/src/renderer/src/components/AboutUs/index.vue index 9f08957..e12b20f 100644 --- a/src/renderer/src/components/AboutUs/index.vue +++ b/src/renderer/src/components/AboutUs/index.vue @@ -5,11 +5,7 @@
📱 使用图形化的 - Scrcpy + Scrcpy 显示和控制您的 Android 设备,由 Electron 驱动
@@ -34,21 +30,45 @@ export default { loading: false, version, percent: 0, + escrcpyURL: 'https://github.com/viarotel-org/escrcpy', } }, created() { + this.onUpdateNotAvailable() this.onUpdateAvailable() this.onDownloadProgress() this.onUpdateDownloaded() - this.$electron.ipcRenderer.on('update-not-available', () => { - this.loading = false - this.$message.success('已经是最新版本') - }) - this.$electron.ipcRenderer.on('error', () => { - this.loading = false - }) + this.onUpdateError() }, methods: { + onUpdateNotAvailable() { + this.$electron.ipcRenderer.on('update-not-available', () => { + this.loading = false + this.$message.success('已经是最新版本') + }) + }, + onUpdateError() { + this.$electron.ipcRenderer.on('update-error', async (event, ret) => { + this.loading = false + console.log('ret', ret) + try { + await this.$confirm( + '你可能需要科学上网,是否前往发布页面手动下载更新?', + '检查更新失败', + { + confirmButtonText: '确定', + cancelButtonText: '取消', + closeOnClickModal: false, + type: 'error', + }, + ) + window.open(`${this.escrcpyURL}/releases`) + } + catch (error) { + console.warn(error.message) + } + }) + }, handleUpdate() { this.loading = true this.$electron.ipcRenderer.send('check-for-update')