From a814f6eb98bb1f38a80415abefd61df71a579a8a Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期三, 12 四月 2023 09:30:43 +0800
Subject: [PATCH] 34
---
electron/main/index.ts | 35 +++++++++++------------------------
1 files changed, 11 insertions(+), 24 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index d4ac784..36dd01e 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -1,13 +1,14 @@
import { app, BrowserWindow, shell, ipcMain,Menu } from 'electron'
import { release } from 'os'
import { join } from 'path'
+
+import logger from '../preload/logger.js'
import fs from 'fs'
import iconv from 'iconv-lite'
//koa----
import Koa from 'koa';
import Router from 'koa-router';
const koaBody = require('koa-body');
-
const creatorKoa=(win)=>{
const app = new Koa();
const router = new Router();
@@ -26,7 +27,6 @@
"data": body,
"message": "接收成功"
}
- // writeResult(body)
})
app.use(router.routes());
@@ -41,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()
@@ -68,8 +63,8 @@
async function createWindow() {
win = new BrowserWindow({
title: 'Main window',
- fullscreen: true,
- // autoHideMenuBar:true,
+ fullscreen: true,// 开启默认全屏
+ // autoHideMenuBar:true, //关闭菜单栏
webPreferences: {
preload: splash,
nodeIntegration: true,
@@ -86,10 +81,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.get('devices'),store.path)
+ win?.webContents.send('getConfigData',store.get(),store.path)
})
// Make all links open with the browser, not with the application
@@ -140,6 +134,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()
@@ -151,18 +151,5 @@
"clientCode": arg.clientCode,
"machineName": arg.machineName,
"screenTimeout": arg.screenTimeout,
- "devices":arg.devices
}
- //对比两端配置文件
- 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.get('devices'),store.path)
- }
-
-
})
\ No newline at end of file
--
Gitblit v1.8.0