Merge branch 'master' into dev

src/main/index.js

@@ -1,4 +1,4 @@
-const { app, BrowserWindow, Menu, shell } = require('electron')
+const { app, BrowserWindow, shell } = require('electron')
 const path = require('path')
 
 // 单例应用程序
@@ -15,7 +15,7 @@ app.on('second-instance', (event, argv, cwd) => {
   }
 })
 
-const isDev = process.env.NODE_ENV !== 'production'
+const isDev = global.isDev = process.env.NODE_ENV !== 'production'
 
 app.on('web-contents-created', (event, contents) => {
   contents.on('will-navigate', (event, navigationUrl) => {
@@ -34,23 +34,23 @@ app.on('web-contents-created', (event, contents) => {
 // https://github.com/electron/electron/issues/18397
 app.allowRendererProcessReuse = !isDev
 
-const { getWindowSizeInfo, parseEnv } = require('./utils')
+const { getAppSetting, parseEnv, getWindowSizeInfo } = require('./utils')
 
 global.envParams = parseEnv()
 
 require('../common/error')
 require('./events')
-const winEvent = require('./events/winEvent')
+require('./rendererEvents')
+const winEvent = require('./rendererEvents/winEvent')
 const autoUpdate = require('./utils/autoUpdate')
-const { isLinux, isMac } = require('../common/utils')
-
+const { isMac, isLinux } = require('../common/utils')
 
 let mainWindow
 let winURL
-let isFirstCheckedUpdate = true
 
 if (isDev) {
-  global.__static = path.join(__dirname, '../static')
+  // eslint-disable-next-line no-undef
+  global.__static = __static
   winURL = 'http://localhost:9080'
 } else {
   global.__static = path.join(__dirname, '/static')
@@ -58,7 +58,7 @@ if (isDev) {
 }
 
 function createWindow() {
-  let windowSizeInfo = getWindowSizeInfo()
+  const windowSizeInfo = getWindowSizeInfo(global.appSetting)
   /**
    * Initial window options
    */
@@ -86,61 +86,27 @@ function createWindow() {
   winEvent(mainWindow)
   // mainWindow.webContents.openDevTools()
 
-  if (!isDev) {
-    autoUpdate(isFirstCheckedUpdate)
-    isFirstCheckedUpdate = false
-  }
+  if (!isDev) autoUpdate()
 }
 
-if (isMac) {
-  const template = [
-    {
-      label: app.getName(),
-      submenu: [
-        { label: '关于洛雪音乐', role: 'about' },
-        { type: 'separator' },
-        { label: '隐藏', role: 'hide' },
-        { label: '显示其他', role: 'hideothers' },
-        { label: '显示全部', role: 'unhide' },
-        { type: 'separator' },
-        { label: '退出', accelerator: 'Command+Q', click: () => app.quit() },
-      ],
-    },
-    {
-      label: '窗口',
-      role: 'window',
-      submenu: [
-        { label: '最小化', role: 'minimize' },
-        { label: '关闭', role: 'close' },
-      ],
-    },
-    {
-      label: '编辑',
-      submenu: [
-        { label: '撤销', accelerator: 'CmdOrCtrl+Z', role: 'undo' },
-        { label: '恢复', accelerator: 'Shift+CmdOrCtrl+Z', role: 'redo' },
-        { type: 'separator' },
-        { label: '剪切', accelerator: 'CmdOrCtrl+X', role: 'cut' },
-        { label: '复制', accelerator: 'CmdOrCtrl+C', role: 'copy' },
-        { label: '粘贴', accelerator: 'CmdOrCtrl+V', role: 'paste' },
-        { label: '选择全部', accelerator: 'CmdOrCtrl+A', role: 'selectAll' },
-      ],
-    },
-  ]
-
-  Menu.setApplicationMenu(Menu.buildFromTemplate(template))
-} else {
-  Menu.setApplicationMenu(null)
+function init() {
+  global.appSetting = getAppSetting()
+  createWindow()
+  global.lx_event.tray.create()
 }
 
-app.on('ready', createWindow)
-
-app.on('window-all-closed', () => {
-  if (!isMac) app.quit()
-})
+app.on('ready', init)
 
 app.on('activate', () => {
-  if (mainWindow === null) {
-    createWindow()
+  if (mainWindow === null) return init()
+})
+
+app.on('window-all-closed', () => {
+  if (isMac) {
+    global.lx_event.tray.destroy()
+  } else {
+    app.quit()
   }
 })
+
+require('./modules')