From e9ef9bfe411bda655f6231f3213cb09039b9dbb7 Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期一, 27 十一月 2023 09:22:21 +0800
Subject: [PATCH] 更新识别逻辑 定时
---
electron/main/index.ts | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index b6fcd92..78d324b 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -1,6 +1,8 @@
import { app, BrowserWindow, shell, ipcMain,Menu } from 'electron'
import { release } from 'os'
import { join } from 'path'
+// import updater from "../preload/autoUpdate.js"
+import logger from '../preload/logger.js'
import fs from 'fs'
import iconv from 'iconv-lite'
//koa----
@@ -59,16 +61,23 @@
const url = `http://${process.env['VITE_DEV_SERVER_HOST']}:${process.env['VITE_DEV_SERVER_PORT']}`
async function createWindow() {
+
win = new BrowserWindow({
title: 'Main window',
+ transparent: true,
+ frame:store.get('debug')===undefined?true:store.get('debug'),//关闭菜单栏
fullscreen: true,// 开启默认全屏
- // autoHideMenuBar:true, //关闭菜单栏
+ kiosk: true,
+ movable:false,// 关闭窗口移动
+
+ // autoHideMenuBar:store.get('debug'),
webPreferences: {
preload: splash,
nodeIntegration: true,
contextIsolation: false,
},
})
+
if (app.isPackaged) {
win.loadFile(join(__dirname, '../../index.html'))
} else {
@@ -98,6 +107,9 @@
if (process.platform !== 'darwin') app.quit()
})
+
+
+
app.on('second-instance', () => {
if (win) {
// 如果用户试图打开另一个窗口，则将焦点放在主窗口上
@@ -105,6 +117,14 @@
win.focus()
}
})
+app.on('render-process-gone',(e,w,d)=>{
+ logger.info(`${new Date()}渲染进程被杀死${d.reason}\n`)
+ // 基于我在开发的程序本身的设定，此处重启应用就可以了
+ app.relaunch({args: process.argv.slice(1).concat(['--relaunch'])});
+ // 尝试关闭所有窗口
+ app.quit();
+})
+
app.on('activate', () => {
const allWindows = BrowserWindow.getAllWindows()
@@ -114,6 +134,10 @@
createWindow()
}
})
+// 自动更新
+// app.on('ready', async () => {
+// updater()
+// })
// 新窗口示例arg:新的Windows url
ipcMain.handle("open-win", (event, arg) => {
@@ -132,6 +156,12 @@
// childWindow.webContents.openDevTools({ mode: "undocked", activate: true })
}
})
+// 主进程处理日志定义
+ipcMain.handle('logger', async(event, arg) => { //与渲染进程通信
+ return new Promise((resolve, reject) => {
+ logger.info(arg)
+ })
+})
// 渲染端发送消息到主进程
ipcMain.on("winClose",()=>{
win?.close()
@@ -144,16 +174,4 @@
"machineName": arg.machineName,
"screenTimeout": arg.screenTimeout,
}
- // //对比两端配置文件
- // if(JSON.stringify(mode1)!=JSON.stringify(mode2)){
- // //更新cofing.json
- // console.log('update confing.json')
- // store.set(mode2)
- // // 重新建立sockte 通讯
- // win?.webContents.send('getScreenTimeout',store.get('screenTimeout'))
- // win?.webContents.send('getPcName',store.get('machineName'))
- // win?.webContents.send('getConfigData',store.get('clientCode'),store.path)
- // }
-
-
})
\ No newline at end of file
--
Gitblit v1.8.0