@@ -55,16 +55,15 @@ async function createWindow() {
55
55
} , {
56
56
label : 'Exit' ,
57
57
click : ( ) => {
58
- loadingWindow . close ( )
59
58
mainWindow . close ( )
60
59
} ,
61
60
} ] ;
62
61
// 创建托盘实例
63
62
if ( process . env . WEBPACK_DEV_SERVER_URL )
64
- const iconPath = nativeImage . createFromPath ( path . join ( __dirname , '../src/assets/' , 'logo.png' ) )
63
+ appTray = new Tray ( path . join ( __dirname , '../src/assets/' , 'logo.png' ) ) ;
65
64
else
66
- const iconPath = nativeImage . createFromPath ( path . join ( ' app://. /icon.png') )
67
- appTray = new Tray ( iconPath ) ;
65
+ appTray = new Tray ( path . join ( app . getAppPath ( ) , ' /icon.png') ) ;
66
+
68
67
// 图标的上下文菜单
69
68
const contextMenu = Menu . buildFromTemplate ( trayMenuTemplate ) ;
70
69
@@ -81,7 +80,6 @@ async function createWindow() {
81
80
82
81
// Load the url of the dev server if in development mode
83
82
84
- createProtocol ( 'app' )
85
83
if ( process . env . WEBPACK_DEV_SERVER_URL )
86
84
mainWindow . loadURL ( process . env . WEBPACK_DEV_SERVER_URL )
87
85
else mainWindow . loadURL ( "app://./index.html" )
@@ -113,6 +111,7 @@ async function createWindow() {
113
111
mainWindow . maximize ( ) ;
114
112
}
115
113
} )
114
+
116
115
// 主进程监听打开托盘事件
117
116
ipcMain . on ( 'hide-in-bar' , ( ) => {
118
117
mainWindow . hide ( )
@@ -176,12 +175,17 @@ async function createLoadingWindow() {
176
175
webSecurity : false ,
177
176
}
178
177
} )
179
- loadingWindow . loadFile ( path . join ( __dirname , '../public/' , 'cover.html' ) )
178
+ createProtocol ( 'app' )
179
+ if ( process . env . WEBPACK_DEV_SERVER_URL )
180
+ loadingWindow . loadURL ( path . join ( __dirname , '../public/' , 'cover.html' ) )
181
+ else loadingWindow . loadURL ( "app://./cover.html" )
182
+
180
183
loadingWindow . show ( )
181
184
loadingWindow . focus ( )
182
185
createWindow ( )
183
186
loadingWindow . setAlwaysOnTop ( ! loadingWindow . isAlwaysOnTop ( ) )
184
187
mainWindow . hide ( )
188
+
185
189
ipcMain . on ( 'loading-finish' , ( ) => {
186
190
setTimeout ( ( ) => {
187
191
mainWindow . show ( )
0 commit comments