From bc4de8e1bb11a3dcdaef3bfb496842ffc14ce1f2 Mon Sep 17 00:00:00 2001 From: yj <1336058017@qq.com> Date: Thu, 25 Jul 2024 14:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 38 ++++----------- package.json | 2 +- src/assets/{updateBg.png => icon7.png} | Bin src/components/UpdateModal/index.module.scss | 22 +++------ src/components/UpdateModal/index.tsx | 47 +++++++++++-------- src/utils/package/imageUrl.ts | 2 + src/utils/styles/App.scss | 2 +- 7 files changed, 47 insertions(+), 66 deletions(-) rename src/assets/{updateBg.png => icon7.png} (100%) diff --git a/main.js b/main.js index 41c10ae..0cb9550 100644 --- a/main.js +++ b/main.js @@ -12,7 +12,7 @@ const { Notification } = require('electron'); const path = require('node:path') -const {autoUpdater, CancellationToken} = require('electron-updater'); +const { autoUpdater, CancellationToken } = require('electron-updater'); const cancellationToken = new CancellationToken() app.allowRendererProcessReuse = false; let mainWindow = null; @@ -34,7 +34,7 @@ class AppWindow extends BrowserWindow { backgroundColor: '#00000000', transparent: true, }; - const finalConfig = {...basicConfig, ...config}; + const finalConfig = { ...basicConfig, ...config }; super(finalConfig); const env = process.argv.find((arg) => arg.startsWith('--env='))?.split('=')[1]; if (env === 'development') { @@ -127,10 +127,7 @@ app.on('ready', () => { } }) autoUpdater.updateConfigPath = path.join('latest.yml') - // autoUpdater.updateConfigPath = path.join('http://test.bossmei.top/electron/latest.yml') } - // autoUpdater.updateConfigPath = path.join('http://test.bossmei.top/electron/latest.yml') - console.log(123123123) createWindow() updateHandle() // 检查更新 createTray() @@ -201,7 +198,7 @@ app.on('ready', () => { mainWindow.setMinimumSize(config.width, config.height); // 设置最大尺寸 const primaryDisplay = screen.getPrimaryDisplay() - const {width, height} = primaryDisplay.workAreaSize + const { width, height } = primaryDisplay.workAreaSize if (config.key === 'login') { mainWindow.setMaximumSize(config.width, config.height); } else { @@ -210,7 +207,7 @@ app.on('ready', () => { // 设置窗口尺寸 mainWindow.setSize(config.width, config.height) // 设置窗口位置使其居中于当前屏幕 - const display = screen.getDisplayMatching({...mainWindow.getBounds()}); + const display = screen.getDisplayMatching({ ...mainWindow.getBounds() }); const x = Math.round((display.workArea.width - mainWindow.getSize()[0]) / 2); const y = Math.round((display.workArea.height - mainWindow.getSize()[1]) / 2); mainWindow.setPosition(x, y); @@ -230,28 +227,20 @@ function updateHandle() { autoUpdater.setFeedURL('http://test.bossmei.top/electron') autoUpdater.autoDownload = false // 不自动下载安装包 autoUpdater.autoInstallOnAppQuit = false // 不自动安装 - // eslint-disable-next-line handle-callback-err autoUpdater.on('error', function (error) { - // sendUpdateError(JSON.stringify(error)) sendUpdateMessage(message.error) }) autoUpdater.on('checking-for-update', function () { - console.log('开始检测') - console.log('checking-for-update') sendUpdateMessage(message.checking) }) autoUpdater.on('update-available', function (info) { - console.log('update-available', info) - let messageStr = JSON.stringify({type: '0'}) - // todo 延迟5秒打开弹窗(逻辑要改) + let messageStr = JSON.stringify({ type: '0' }) setTimeout(() => { sendUpdateMessage(messageStr) }, 5000) - // sendUpdateMessage(message.updateAva) }) autoUpdater.on('update-not-available', function (info) { - console.log(info) - // sendUpdateMessage(message.updateNotAva) + }) // 更新下载进度事件 autoUpdater.on('download-progress', function (progressObj) { @@ -260,23 +249,12 @@ function updateHandle() { value: progressObj.percent }) sendUpdateMessage(message) - console.log(progressObj.percent) - // mainWindow.webContents.send('downloadProgress', progressObj) }) autoUpdater.on('update-downloaded', function (event, releaseNotes, releaseName, releaseDate, updateUrl, quitAndUpdate) { - console.log('下载完成---------------') let message = JSON.stringify({ - type: '3', + type: '2', }) - // sendUpdateMessage(message) - autoUpdater.quitAndInstall() - ipcMain.on('isUpdateNow', (e, arg) => { - console.log(arg) - console.log('开始更新') - // some code here to handle event - autoUpdater.quitAndInstall() - }) - // mainWindow.webContents.send('isUpdateNow') + sendUpdateMessage(message) }) } diff --git a/package.json b/package.json index a351bd9..2128e5f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "multi.person.meeting", "private": true, - "version": "0.0.3", + "version": "0.0.2", "main": "main.js", "authors": "yj", "description": "test", diff --git a/src/assets/updateBg.png b/src/assets/icon7.png similarity index 100% rename from src/assets/updateBg.png rename to src/assets/icon7.png diff --git a/src/components/UpdateModal/index.module.scss b/src/components/UpdateModal/index.module.scss index 13822e8..a89a96e 100644 --- a/src/components/UpdateModal/index.module.scss +++ b/src/components/UpdateModal/index.module.scss @@ -1,8 +1,8 @@ .isUpdateModal { - width: 338px; - height: 432px; - background: url("../../assets/updateBg.png"); - background-size: 100% 100%; + height: 400px; + background-color: rgb(21, 25, 29); + background-size: 100% auto; + background-repeat: no-repeat; color: #ffffff; padding: 230px 30px 0; box-sizing: border-box; @@ -15,21 +15,13 @@ .buttons { width: 100%; margin-top: 32px; - font-size: 16px; text-align: center; - .button1 { - width: 100%; - height: 44px; - background-color: #5575F2; - line-height: 44px; - border-radius: 10px; - } - .button2 { margin-top: 20px; color: #555454; + cursor: pointer; + font-size: 14px; } } -} - +} \ No newline at end of file diff --git a/src/components/UpdateModal/index.tsx b/src/components/UpdateModal/index.tsx index a49d571..6ee6919 100644 --- a/src/components/UpdateModal/index.tsx +++ b/src/components/UpdateModal/index.tsx @@ -1,19 +1,19 @@ import styles from '@/components/UpdateModal/index.module.scss' -import {Flex, Modal, Progress} from 'antd'; -import {forwardRef, useImperativeHandle, useState} from "react"; +import ImageUrl from '@/utils/package/ImageUrl'; +import { Button, Flex, Modal, Progress } from 'antd'; +import { forwardRef, useImperativeHandle, useState } from "react"; const UpdateModal = forwardRef((props: any, ref: any) => { useImperativeHandle(ref, () => ({ changeModal: (data: any) => { let dataJson = JSON.parse(data) - console.log(dataJson) - setIsUpdateModal(true) getContent() if (dataJson.type === '0') { // 打开弹窗 setIsUpdateModal(true) } else if (dataJson.type === '1') { // 下载中 返回进度值 - console.log('下载中', dataJson.value.toFixed(2)) setProgress(dataJson.value.toFixed(2)) + } else if (dataJson.type === '2') { // 下载完成 + setProgress(100) } } })) @@ -30,15 +30,15 @@ const UpdateModal = forwardRef((props: any, ref: any) => { throw new Error('Network response was not ok.'); }) .then(textContent => { - console.log(textContent); }) .catch(error => { - console.error('There has been a problem with your fetch operation:', error); }); } function closeModal() { - window.electron.onDownload('0') // 取消下载 + if (progress != 100) { + window.electron.onDownload('0') // 取消下载 + } setIsUpdateModal(false) } @@ -51,25 +51,34 @@ const UpdateModal = forwardRef((props: any, ref: any) => { onCancel={() => closeModal()} centered width={'338px'} + className='modal-padding' + maskClosable={true} > -
+
{updateContent}
{ !progress ?
-
window.electron.onDownload('1')}>立即更新 -
+
setIsUpdateModal(false)}>暂不更新
-
: -
- 下载进度：{progress}% - - - -
+
: progress < 100 ? +
+ 下载进度：{progress}% + + + +
: + }
diff --git a/src/utils/package/imageUrl.ts b/src/utils/package/imageUrl.ts index 46180f4..73bb60b 100644 --- a/src/utils/package/imageUrl.ts +++ b/src/utils/package/imageUrl.ts @@ -6,6 +6,7 @@ import icon3 from '@/assets/icon3.png' import icon4 from '@/assets/icon4.png' import icon5 from '@/assets/icon5.png' import icon6 from '@/assets/icon6.png' +import icon7 from '@/assets/icon7.png' import icon8 from '@/assets/icon8.png' import icon9 from '@/assets/icon9.png' import icon10 from '@/assets/icon10.png' @@ -61,6 +62,7 @@ export default { icon4, icon5, icon6, + icon7, icon8, icon9, icon10, diff --git a/src/utils/styles/App.scss b/src/utils/styles/App.scss index 9313cdd..4d1353b 100644 --- a/src/utils/styles/App.scss +++ b/src/utils/styles/App.scss @@ -282,7 +282,7 @@ $pagination-hover-background-color: #5575F2; } .ant-modal-body { - max-height: 70vh; + max-height: 80vh; overflow-y: auto; } }