fix: 🐛 修复 macOS 最小化到托盘后状态栏图标不显示的问题

.github/workflows/release-assets.yml

@@ -63,7 +63,10 @@ jobs:
             dist-release/*.deb
             dist-release/*.rpm
             dist-release/*.tar.gz
-            dist-release/*.yml
             dist-release/*.blockmap
+            dist-release/latest.yml
+            dist-release/latest-mac.yml
+            dist-release/latest-linux.yml
+            dist-release/latest-linux-arm64.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

README.md

@@ -4,7 +4,7 @@
 
 # Escrcpy
 
-📱 使用图形界面的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动。 [查看更多截图](https://github.com/viarotel-org/escrcpy/tree/main/public/screenshot)
+📱 使用图形界面的 Scrcpy 显示和控制您的 Android 设备，由 Electron 驱动。 [查看更多截图](https://github.com/viarotel-org/escrcpy/tree/main/screenshots)
 
 <div style="display:flex;">
   <img src="https://p6-juejin.byteimg.com/tos-cn-i-k3u1fbpfcp/da63c9db7a944899b0ad27a0b67d29ae~tplv-k3u1fbpfcp-jj-mark:0:0:0:0:q75.image" alt="viarotel-escrcpy" style="width: 100%;">

electron-builder.json

@@ -59,7 +59,7 @@
       "to": "extra",
       "filter": ["**/*", "!core"]
     },
-    "entitlementsInherit": "electron/resources/build/entitlements.mac.plist",
+    "entitlementsInherit": "entitlements.mac.plist",
     "extendInfo": {
       "NSDocumentsFolderUsageDescription": "Application requests access to the user's Documents folder.",
       "NSDownloadsFolderUsageDescription": "Application requests access to the user's Downloads folder."

electron/configs/index.js

@@ -7,12 +7,14 @@ export const desktopPath = process.env.DESKTOP_PATH
 
 export const devPublishPath = resolve('dev-publish.yml')
 
-export const logoPath = buildResolve('logo@256x256.png')
+export const logoPath = buildResolve('logo.png')
 export const icoLogoPath = buildResolve('logo.ico')
 export const icnsLogoPath = buildResolve('logo.icns')
 
-export const trayPath = extraResolve('tray.png')
+export const trayPath
-export const macTrayPath = extraResolve('tray-Template.png')
+  = process.platform === 'darwin'
+    ? extraResolve('trayTemplate.png')
+    : extraResolve('tray.png')
 
 export const adbPath
   = process.platform === 'win32'

electron/events/tray/index.js

@@ -1,5 +1,5 @@
 import { Menu, Tray, app, dialog } from 'electron'
-import { macTrayPath, trayPath } from '@electron/configs/index'
+import { trayPath } from '@electron/configs/index.js'
 import appStore from '@electron/helpers/store.js'
 
 export default (mainWindow) => {
@@ -29,9 +29,7 @@ export default (mainWindow) => {
     else if (response === 1) {
       mainWindow.hide()
 
-      const trayIcon = process.platform === 'darwin' ? macTrayPath : trayPath
+      tray = new Tray(trayPath)
-
-      tray = new Tray(trayIcon)
 
       tray.setToolTip('escrcpy')
 

src/components/About/index.vue

@@ -1,21 +1,38 @@
 <template>
   <div class="flex flex-col items-center justify-center h-full -mt-8">
     <div class="">
-      <img src="@/assets/logo.png" class="h-48" alt="" />
+      <img src="@electron/resources/build/logo.png" class="h-48" alt="" />
     </div>
     <div class="pt-4 text-xl text-center italic text-gray-700">
       📱 使用图形化的
-      <a class="hover:underline text-primary-500" :href="escrcpyURL" target="_blank">Scrcpy</a>
+      <a
+        class="hover:underline text-primary-500"
+        :href="escrcpyURL"
+        target="_blank"
+      >Scrcpy</a>
       显示和控制您的 Android 设备，由 Electron 驱动
     </div>
     <div class="pt-12 pb-4">
-      <el-button :loading="loading" type="primary" size="large" @click="handleUpdate">
+      <el-button
-        {{ loading && percent ? `正在更新中...（${percent.toFixed(1)}%）` : '版本检测更新' }}
+        :loading="loading"
+        type="primary"
+        size="large"
+        @click="handleUpdate"
+      >
+        {{
+          loading && percent
+            ? `正在更新中...（${percent.toFixed(1)}%）`
+            : "版本检测更新"
+        }}
       </el-button>
     </div>
     <div class="text-sm">
       Supported by
-      <a class="hover:underline text-primary-500" href="https://viarotel.github.io/" target="_blank">Viarotel</a>
+      <a
+        class="hover:underline text-primary-500"
+        href="https://viarotel.github.io/"
+        target="_blank"
+      >Viarotel</a>
       v{{ version }}
     </div>
   </div>

vite.config.js

@@ -31,6 +31,7 @@ export default params =>
       resolve: {
         alias: {
           '@': resolve('src'),
+          '@electron': resolve('electron'),
         },
       },
       plugins: [