fix: 🚀 修复 MacOS 软件包安装后无线显示 Logo 的问题

viarotel-org · Oct 20, 2023 · 77dd81b · 77dd81b
1 parent 6dcff6e
commit 77dd81b
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 32 deletions.
diff --git a/.github/workflows/release-assets.yml b/.github/workflows/release-assets.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            arch: amd64
+            arch: [arm64, amd64]
           - os: macos-latest
             arch: [arm64, amd64]
           - os: windows-latest

diff --git a/electron-builder.json b/electron-builder.json
@@ -14,21 +14,18 @@
     "repo": "escrcpy",
     "updaterCacheDirName": "escrcpy-updater"
   },
-  "mac": {
-    "icon": "logo.icns",
-    "target": [
-      {
-        "target": "dmg",
-        "arch": ["universal", "arm64", "x64"]
-      }
-    ],
-    "artifactName": "${productName}-${version}-mac-installer.${ext}",
-    "entitlementsInherit": "electron/resources/build/entitlements.mac.plist",
-    "extendInfo": {
-      "NSDocumentsFolderUsageDescription": "Application requests access to the user's Documents folder.",
-      "NSDownloadsFolderUsageDescription": "Application requests access to the user's Downloads folder."
-    },
-    "notarize": false
+  "nsis": {
+    "artifactName": "${productName}-${version}-win-setup.${ext}",
+    "shortcutName": "${productName}",
+    "uninstallDisplayName": "${productName}",
+    "oneClick": false,
+    "perMachine": false,
+    "allowToChangeInstallationDirectory": true,
+    "deleteAppDataOnUninstall": false
+  },
+  "portable": {
+    "artifactName": "${productName}-${version}-win-portable.${ext}",
+    "requestExecutionLevel": "user"
   },
   "win": {
     "icon": "logo.ico",
@@ -38,33 +35,63 @@
         "arch": ["x64"]
       },
       {
-        "target": "zip"
+        "target": "zip",
+        "arch": ["x64"]
       },
       {
-        "target": "portable"
+        "target": "portable",
+        "arch": ["x64"]
       }
     ],
     "extraResources": {
       "from": "electron/resources/extra",
       "to": "extra"
     }
   },
-  "nsis": {
-    "artifactName": "${productName}-${version}-win-setup.${ext}",
-    "shortcutName": "${productName}",
-    "uninstallDisplayName": "${productName}",
-    "oneClick": false,
-    "perMachine": false,
-    "allowToChangeInstallationDirectory": true,
-    "deleteAppDataOnUninstall": false
-  },
-  "portable": {
-    "artifactName": "${productName}-${version}-win-portable.${ext}",
-    "requestExecutionLevel": "user"
+  "mac": {
+    "icon": "logo.icns",
+    "target": [
+      {
+        "target": "dmg",
+        "arch": ["universal", "x64", "arm64"]
+      },
+      {
+        "target": "zip",
+        "arch": ["universal", "x64", "arm64"]
+      }
+    ],
+    "artifactName": "${productName}-${version}-mac-${arch}.${ext}",
+    "entitlementsInherit": "electron/resources/build/entitlements.mac.plist",
+    "extendInfo": {
+      "NSDocumentsFolderUsageDescription": "Application requests access to the user's Documents folder.",
+      "NSDownloadsFolderUsageDescription": "Application requests access to the user's Downloads folder."
+    },
+    "type": "development",
+    "notarize": false,
+    "darkModeSupport": true,
+    "hardenedRuntime": false
   },
   "linux": {
+    "category": "Utility",
     "icon": "logo.png",
-    "target": ["AppImage"],
+    "target": [
+      {
+        "target": "AppImage",
+        "arch": ["x64", "arm64"]
+      },
+      {
+        "target": "deb",
+        "arch": ["x64", "arm64"]
+      },
+      {
+        "target": "rpm",
+        "arch": ["x64"]
+      },
+      {
+        "target": "snap",
+        "arch": ["x64"]
+      }
+    ],
     "artifactName": "${productName}-${version}-linux.${ext}"
   },
   "npmRebuild": false

diff --git a/electron/resources/build/logo.icns b/electron/resources/build/logo.icns
diff --git a/electron/resources/build/logo.ico b/electron/resources/build/logo.ico
diff --git a/electron/resources/build/logo.png b/electron/resources/build/logo.png
diff --git a/public/logo.ico b/public/logo.ico
diff --git a/src/assets/icon.png b/src/assets/icon.png
diff --git a/src/assets/logo.png b/src/assets/logo.png
diff --git a/src/components/About/index.vue b/src/components/About/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="flex flex-col items-center justify-center h-full -mt-8">
     <div class="">
-      <img src="@/assets/icon.png" class="h-48" alt="" />
+      <img src="@/assets/logo.png" class="h-48" alt="" />
     </div>
     <div class="pt-4 text-xl text-center italic text-gray-700">
       📱 使用图形化的