From 2510046e4e09c929cdb0d5adcecde62fd3a20cf4 Mon Sep 17 00:00:00 2001
From: chenyincheng <501753378@qq.com>
Date: 星期六, 07 一月 2023 11:45:19 +0800
Subject: [PATCH] 更新外网订阅

---
 electron/main/index.ts |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/electron/main/index.ts b/electron/main/index.ts
index a18aeb8..6245fad 100644
--- a/electron/main/index.ts
+++ b/electron/main/index.ts
@@ -66,8 +66,8 @@
 async function createWindow() {
   win = new BrowserWindow({
     title: 'Main window',
-    fullscreen: false,
-    // autoHideMenuBar:true, 
+    fullscreen: true,// 开启默认全屏
+    // autoHideMenuBar:true, //关闭菜单栏
     webPreferences: {
       preload: splash,
       nodeIntegration: true,
@@ -86,7 +86,7 @@
     creatorKoa(win)
     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
@@ -149,16 +149,16 @@
     "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)
-  }
+  // //对比两端配置文件
+  // 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