From 10bdb4ff5b468c77aad45ab2ec5158d715ab6a3d Mon Sep 17 00:00:00 2001
From: chenyc <501753378@qq.com>
Date: 星期三, 19 七月 2023 14:53:11 +0800
Subject: [PATCH] 更新测温模块
---
electron/main/index.ts | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index 21420db..7b6eb70 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----
@@ -39,11 +41,6 @@
const store = new Store();
console.log(store.path)
-// 读
-// console.log(store.get('clientCode'))
-// console.log(store.get('deviceList'))
-// 写
-// store.set("testr","test001")
// Disable GPU Acceleration for Windows 7
if (release().startsWith('6.1')) app.disableHardwareAcceleration()
@@ -64,16 +61,18 @@
const url = `http://${process.env['VITE_DEV_SERVER_HOST']}:${process.env['VITE_DEV_SERVER_PORT']}`
async function createWindow() {
+
win = new BrowserWindow({
title: 'Main window',
- fullscreen: true,
- // autoHideMenuBar:true,
+ fullscreen: true,// 开启默认全屏
+ autoHideMenuBar:store.get('debug'), //关闭菜单栏
webPreferences: {
preload: splash,
nodeIntegration: true,
contextIsolation: false,
},
})
+
if (app.isPackaged) {
win.loadFile(join(__dirname, '../../index.html'))
} else {
@@ -84,10 +83,9 @@
// 测试推送消息到Renderer进程
win.webContents.on('did-finish-load', () => {
creatorKoa(win)
- win?.webContents.send('message-koa','nihao0-----')
win?.webContents.send('getScreenTimeout',store.get('screenTimeout'))
win?.webContents.send('getPcName',store.get('machineName'))
- win?.webContents.send('getConfigData',store.get('clientCode'),store.path)
+ win?.webContents.send('getConfigData',store.get(),store.path)
})
// Make all links open with the browser, not with the application
@@ -103,6 +101,7 @@
win = null
if (process.platform !== 'darwin') app.quit()
})
+
app.on('second-instance', () => {
if (win) {
@@ -120,6 +119,10 @@
createWindow()
}
})
+// 自动更新
+// app.on('ready', async () => {
+// updater()
+// })
// 新窗口示例arg:新的Windows url
ipcMain.handle("open-win", (event, arg) => {
@@ -138,6 +141,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()
@@ -150,16 +159,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