Merge pull request #118 from 15814596022/main

[fix] 修复dev模式无法找到tray相关文件的bug,修改__static开发模式路径
umbrella22 · Aug 29, 2023 · a4d1f88 · a4d1f88
2 parents d68c3a3 + 352f8b8
commit a4d1f88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/main/config/StaticPath.ts b/src/main/config/StaticPath.ts
@@ -11,7 +11,7 @@ class StaticPath {
       : join(app.getAppPath(), "..", "..");
     this.__updateFolder = join(basePath, `${HotUpdateFolder}`);
     if (isDev) {
-      this.__static = join(basePath, "public");
+      this.__static = join(basePath, "src", "renderer", "public");
       this.__lib = join(
         basePath,
         `rootLib`,
@@ -108,10 +108,10 @@ export const trayURL = getUrl(
     `${staticPath.__static}/tray.html`
   );
 export const trayIconPath = isDev
-  ? join(app.getAppPath(), "..", "renderer", "trayIcon", "trayIcon.png")
+  ? join(staticPath.__static, "trayIcon", "trayIcon.png")
   : join(app.getAppPath(), "dist", "electron", "renderer", "trayIcon", "trayIcon.png");
 export const trayTransparentIconPath = isDev
-  ? join(app.getAppPath(), "..", "renderer", "trayIcon", "transparent.png")
+  ? join(staticPath.__static, "trayIcon", "transparent.png")
   : join(app.getAppPath(), "dist", "electron", "renderer", "trayIcon", "transparent.png");
 export const lib = staticPath.__lib;
 export const common = staticPath.__common;

diff --git a/src/main/services/trayManager.ts b/src/main/services/trayManager.ts
@@ -4,6 +4,7 @@ import { trayURL, trayIconPath, trayTransparentIconPath } from "../config/Static
 let tray: Tray
 
 export function initTray() {
+  console.log('trayIconPath', trayIconPath)
   tray = new Tray(trayIconPath);
 
   tray.setToolTip(app.name)