ee-core 1.2.4 → 1.2.7-beta

package/config/config.default.js

@@ -231,5 +231,17 @@ module.exports = appInfo => {
    */
   config.openAppMenu = true; 
 
+  /**
+   * 硬件加速
+   */
+  config.hardGpu = {
+    enable: false
+  }; 
+
+  /**
+   * loading页（废弃）
+   */
+  config.loadingPage = false;  
+
   return config;
 };

package/lib/eeApp.js

@@ -5,6 +5,7 @@ const BaseApp = require('./baseApp');
 const is = require('is-type-of');
 const Koa = require('koa');
 const koaServe = require('koa-static');
+const utilsCommon = require('../utils/common');
 
 class EeApp extends BaseApp {
   constructor(options = {}) {
@@ -84,6 +85,11 @@ class EeApp extends BaseApp {
     app.on('before-quit', () => {
       self.electron.extra.closeWindow = true;
     })
+
+    if (this.config.hardGpu.enable == false) {
+      app.disableHardwareAcceleration();
+    }
+
     await this.electronAppReady();
   }
     
@@ -93,6 +99,12 @@ class EeApp extends BaseApp {
   async createWindow () {
     const winOptions = this.config.windowsOption;
     this.electron.mainWindow = new BrowserWindow(winOptions);
+    let win = this.electron.mainWindow;
+    if (winOptions.show === false) {
+      win.once('ready-to-show', () => {
+        win.show();
+      })
+    }
 
     // 菜单显示/隐藏
     if (this.config.openAppMenu === 'dev-show'
@@ -114,7 +126,7 @@ class EeApp extends BaseApp {
 
     // DevTools
     if (!app.isPackaged && this.config.openDevTools) {
-      this.electron.mainWindow.webContents.openDevTools();
+      win.webContents.openDevTools();
     }
   }
 
@@ -142,10 +154,13 @@ class EeApp extends BaseApp {
    * 加载loading页面
    */
   loadingView (winOptions) {
+    let currentV = process.versions.electron;
+    if (utilsCommon.compareVersion(currentV, '12.2.3') == 1) {
+      return;
+    }
     if (!this.config.loadingPage) {
       return;
     }
-
     const self = this;
     const loadingBrowserView = new BrowserView();
     this.electron.mainWindow.setBrowserView(loadingBrowserView);
@@ -237,31 +252,11 @@ class EeApp extends BaseApp {
     this.electron.mainWindow.loadURL(url);
   }
 
-  /**
-   * 限制一个窗口
-   */
-  // async limitOneWindow () {
-  //   const gotTheLock = app.requestSingleInstanceLock();
-  //   if (!gotTheLock) {
-  //     await this.appQuit();
-  //   }
-  // }
-
   /**
    * electron app退出
    */  
   async appQuit () {
     await this.beforeClose();
-    
-    // 窗口销毁
-    //this.electron.mainWindow.close();
-
-    //console.log('Exit now!');
-    // 托盘销毁
-    // if (this.electron.tray) {
-    //   console.log('ssssssssssss');
-    //   this.electron.tray.destroy();
-    // }
 
     app.quit();
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "1.2.4",
+  "version": "1.2.7-beta",
   "description": "ee core",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "bin": {
-    "ee-cli": "bin/tools.js"
+    "ee-core": "./bin/tools.js"
   },
   "dependencies": {
     "agentkeepalive": "^4.2.0",

package/utils/common.js

@@ -0,0 +1,30 @@
+
+/**
+ * 版本号比较
+ */
+exports.compareVersion = function (v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+  
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+

package/utils/index.js

@@ -170,3 +170,33 @@ exports.callFn = async function (fn, args, ctx) {
 exports.middleware = function (fn) {
   return is.generatorFunction(fn) ? convert(fn) : fn;
 }
+
+/**
+ * 版本号比较
+ */
+exports.compareVersion = function (v1, v2) {
+  v1 = v1.split('.')
+  v2 = v2.split('.')
+  const len = Math.max(v1.length, v2.length)
+
+  while (v1.length < len) {
+    v1.push('0')
+  }
+  while (v2.length < len) {
+    v2.push('0')
+  }
+  
+  for (let i = 0; i < len; i++) {
+    const num1 = parseInt(v1[i])
+    const num2 = parseInt(v2[i])
+
+    if (num1 > num2) {
+      return 1
+    } else if (num1 < num2) {
+      return -1
+    }
+  }
+
+  return 0
+}
+