From f787bf4f4631b2ecb6bb6b46f52a9c7e3f8f8cc0 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期一, 26 十二月 2022 19:30:30 +0800
Subject: [PATCH] up
---
electron/main/index.ts | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/electron/main/index.ts b/electron/main/index.ts
index d4ac784..b1f4295 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -7,7 +7,6 @@
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 +25,6 @@
"data": body,
"message": "接收成功"
}
- // writeResult(body)
})
app.use(router.routes());
@@ -68,7 +66,7 @@
async function createWindow() {
win = new BrowserWindow({
title: 'Main window',
- fullscreen: true,
+ fullscreen: false,
// autoHideMenuBar:true,
webPreferences: {
preload: splash,
@@ -86,10 +84,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
@@ -151,18 +148,17 @@
"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)
- }
+ // //对比两端配置文件
+ // 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