Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

src/main/index.ts

@@ -113,6 +113,10 @@ function createWindow(): void {
       allowRunningInsecureContent: true
     }
   })
+  ipcMain.on("restart", () => {
+    app.relaunch();
+    forceQuit();
+  });
   // 监听启动页完成的消息
   ipcMain.on('splash-completed', () => {
     // 启动页进度条已完成，可以关闭启动页并显示主窗口
@@ -206,16 +210,21 @@ function createWindow(): void {
     }
     * */
 
-    console.log('GetHomeDir()', GetHomeDir())
+    // console.log('GetHomeDir()', GetHomeDir())
+    let prefix =
+    process.env.NODE_ENV === "development"
+      ? "src/renderer/public"
+      : "resources/app.asar/out/renderer";
     let data = {};
     for (const objKey in obj) {
       let files = fs.readdirSync(
         path.join(
-          global.__static ? global.__static : GetHomeDir() + "/src/renderer/public",
+          GetHomeDir(),
+          prefix,
           obj[objKey]
         )
       );
-      console.log(files);
+      // console.log(files);
       for (let i = 0; i < files.length; i++) {
         files[i] = obj[objKey] + "/" + files[i];
       }