diff --git a/README.md b/README.md index aa0ea5e..a657f70 100644 --- a/README.md +++ b/README.md @@ -74,3 +74,39 @@ Tauri 原始输出目录: - `call-client/src-tauri/tauri.conf.json` - `broadcast-client/src-tauri/tauri.conf.json` + +## 4. 应用图标(bundle) + +### 推荐:`tauri icon`(`@tauri-apps/cli` 内置,社区常用) + +Tauri 官方 CLI 提供 **`tauri icon`**:用**一张**高质量源图生成各平台所需尺寸(`32x32.png`、`128x128.png`、`icon.ico` 等)。部分环境下 **`tauri.conf.json` 的 `bundle.icon` 不会自动改写**,若发现未更新,请确认其中包含上述生成文件(本仓库已按生成结果维护默认列表)。 + +**源图要求:** 正方形 **PNG**,建议 **1024×1024**,**RGBA**(带透明)。可先用 Photoshop / Figma 导出一张再执行下面命令。 + +在各子项目根目录执行: + +```bash +# call-client(默认源图:src-tauri/icons/call_icon.png) +cd call-client +npm run icons:generate +``` + +```bash +# broadcast-client(默认源图:src-tauri/icons/bc_icon.png) +cd broadcast-client +npm run icons:generate +``` + +等价命令: + +```bash +npm run tauri -- icon ./src-tauri/icons/call_icon.png +# 或 broadcast-client 下对 bc_icon.png +``` + +生成结果会写入各项目 `src-tauri/icons/`。若 **`bundle.icon` 未自动更新**,请对照目录里新生成的 `32x32.png`、`128x128.png`、`128x128@2x.png`、`icon.icns`、`icon.ico`、`icon.png` 检查配置。换源图路径可改对应 `package.json` 里的 **`icons:generate`** 脚本。 + +### 说明 + +- 这里使用的是 **`@tauri-apps/cli` 自带的 `icon` 子命令**,无需再装名为 `tauri-icon` 的独立包;若文档里写作「tauri-icon 工具」,一般即指该命令。 +- 源图若不是 RGBA,构建阶段仍可能报 `icon ... is not RGBA`,请在上游导出时勾选透明度。 diff --git a/broadcast-client/package.json b/broadcast-client/package.json index 7929939..ca76e4d 100644 --- a/broadcast-client/package.json +++ b/broadcast-client/package.json @@ -18,7 +18,8 @@ "test": "vitest", "test:run": "vitest run", "preview": "vite preview", - "tauri": "tauri" + "tauri": "tauri", + "icons:generate": "tauri icon ./src-tauri/icons/bc_icon.png" }, "dependencies": { "@tauri-apps/api": "^1", diff --git a/broadcast-client/src-tauri/icons/128x128.png b/broadcast-client/src-tauri/icons/128x128.png index bca6043..f9be758 100644 Binary files a/broadcast-client/src-tauri/icons/128x128.png and b/broadcast-client/src-tauri/icons/128x128.png differ diff --git a/broadcast-client/src-tauri/icons/128x128@2x.png b/broadcast-client/src-tauri/icons/128x128@2x.png index 885e15c..3938766 100644 Binary files a/broadcast-client/src-tauri/icons/128x128@2x.png and b/broadcast-client/src-tauri/icons/128x128@2x.png differ diff --git a/broadcast-client/src-tauri/icons/32x32.png b/broadcast-client/src-tauri/icons/32x32.png index f1680a5..f9ed477 100644 Binary files a/broadcast-client/src-tauri/icons/32x32.png and b/broadcast-client/src-tauri/icons/32x32.png differ diff --git a/broadcast-client/src-tauri/icons/Square107x107Logo.png b/broadcast-client/src-tauri/icons/Square107x107Logo.png index fa672cd..a8dff61 100644 Binary files a/broadcast-client/src-tauri/icons/Square107x107Logo.png and b/broadcast-client/src-tauri/icons/Square107x107Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square142x142Logo.png b/broadcast-client/src-tauri/icons/Square142x142Logo.png index dc60106..19484e1 100644 Binary files a/broadcast-client/src-tauri/icons/Square142x142Logo.png and b/broadcast-client/src-tauri/icons/Square142x142Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square150x150Logo.png b/broadcast-client/src-tauri/icons/Square150x150Logo.png index f105b94..4a31458 100644 Binary files a/broadcast-client/src-tauri/icons/Square150x150Logo.png and b/broadcast-client/src-tauri/icons/Square150x150Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square284x284Logo.png b/broadcast-client/src-tauri/icons/Square284x284Logo.png index acb19fb..9f25889 100644 Binary files a/broadcast-client/src-tauri/icons/Square284x284Logo.png and b/broadcast-client/src-tauri/icons/Square284x284Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square30x30Logo.png b/broadcast-client/src-tauri/icons/Square30x30Logo.png index b8e2077..6d4447b 100644 Binary files a/broadcast-client/src-tauri/icons/Square30x30Logo.png and b/broadcast-client/src-tauri/icons/Square30x30Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square310x310Logo.png b/broadcast-client/src-tauri/icons/Square310x310Logo.png index c0ab349..a02ae0e 100644 Binary files a/broadcast-client/src-tauri/icons/Square310x310Logo.png and b/broadcast-client/src-tauri/icons/Square310x310Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square44x44Logo.png b/broadcast-client/src-tauri/icons/Square44x44Logo.png index 735d939..47d58e5 100644 Binary files a/broadcast-client/src-tauri/icons/Square44x44Logo.png and b/broadcast-client/src-tauri/icons/Square44x44Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square71x71Logo.png b/broadcast-client/src-tauri/icons/Square71x71Logo.png index 792bbc5..7dfb75b 100644 Binary files a/broadcast-client/src-tauri/icons/Square71x71Logo.png and b/broadcast-client/src-tauri/icons/Square71x71Logo.png differ diff --git a/broadcast-client/src-tauri/icons/Square89x89Logo.png b/broadcast-client/src-tauri/icons/Square89x89Logo.png index 01610fb..8094ea4 100644 Binary files a/broadcast-client/src-tauri/icons/Square89x89Logo.png and b/broadcast-client/src-tauri/icons/Square89x89Logo.png differ diff --git a/broadcast-client/src-tauri/icons/StoreLogo.png b/broadcast-client/src-tauri/icons/StoreLogo.png index 295207c..bea12d0 100644 Binary files a/broadcast-client/src-tauri/icons/StoreLogo.png and b/broadcast-client/src-tauri/icons/StoreLogo.png differ diff --git a/broadcast-client/src-tauri/icons/bc_icon.png b/broadcast-client/src-tauri/icons/bc_icon.png index 8c98fcd..6fe6890 100644 Binary files a/broadcast-client/src-tauri/icons/bc_icon.png and b/broadcast-client/src-tauri/icons/bc_icon.png differ diff --git a/broadcast-client/src-tauri/icons/icon.icns b/broadcast-client/src-tauri/icons/icon.icns index 27028f1..2dbab01 100644 Binary files a/broadcast-client/src-tauri/icons/icon.icns and b/broadcast-client/src-tauri/icons/icon.icns differ diff --git a/broadcast-client/src-tauri/icons/icon.ico b/broadcast-client/src-tauri/icons/icon.ico index f999d5a..fa72c13 100644 Binary files a/broadcast-client/src-tauri/icons/icon.ico and b/broadcast-client/src-tauri/icons/icon.ico differ diff --git a/broadcast-client/src-tauri/icons/icon.png b/broadcast-client/src-tauri/icons/icon.png index c075d42..314e217 100644 Binary files a/broadcast-client/src-tauri/icons/icon.png and b/broadcast-client/src-tauri/icons/icon.png differ diff --git a/broadcast-client/src-tauri/tauri.conf.json b/broadcast-client/src-tauri/tauri.conf.json index 69da72f..07db397 100644 --- a/broadcast-client/src-tauri/tauri.conf.json +++ b/broadcast-client/src-tauri/tauri.conf.json @@ -47,7 +47,12 @@ "bundleMediaFramework": false }, "icon": [ - "icons/bc_icon.png" + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico", + "icons/icon.png" ] } } diff --git a/call-client/package.json b/call-client/package.json index 98fbaa2..221e965 100644 --- a/call-client/package.json +++ b/call-client/package.json @@ -18,7 +18,8 @@ "test": "vitest", "test:run": "vitest run", "preview": "vite preview", - "tauri": "tauri" + "tauri": "tauri", + "icons:generate": "tauri icon ./src-tauri/icons/call_icon.png" }, "dependencies": { "@element-plus/icons-vue": "^2.3.2", diff --git a/call-client/src-tauri/icons/128x128.png b/call-client/src-tauri/icons/128x128.png index 12db798..bd59ef1 100644 Binary files a/call-client/src-tauri/icons/128x128.png and b/call-client/src-tauri/icons/128x128.png differ diff --git a/call-client/src-tauri/icons/128x128@2x.png b/call-client/src-tauri/icons/128x128@2x.png index f12c033..bad9271 100644 Binary files a/call-client/src-tauri/icons/128x128@2x.png and b/call-client/src-tauri/icons/128x128@2x.png differ diff --git a/call-client/src-tauri/icons/32x32.png b/call-client/src-tauri/icons/32x32.png index 3be73fb..e376119 100644 Binary files a/call-client/src-tauri/icons/32x32.png and b/call-client/src-tauri/icons/32x32.png differ diff --git a/call-client/src-tauri/icons/Square107x107Logo.png b/call-client/src-tauri/icons/Square107x107Logo.png index 29eda98..1844c51 100644 Binary files a/call-client/src-tauri/icons/Square107x107Logo.png and b/call-client/src-tauri/icons/Square107x107Logo.png differ diff --git a/call-client/src-tauri/icons/Square142x142Logo.png b/call-client/src-tauri/icons/Square142x142Logo.png index 1c285b0..ca60bfa 100644 Binary files a/call-client/src-tauri/icons/Square142x142Logo.png and b/call-client/src-tauri/icons/Square142x142Logo.png differ diff --git a/call-client/src-tauri/icons/Square150x150Logo.png b/call-client/src-tauri/icons/Square150x150Logo.png index ce2be32..8de49a4 100644 Binary files a/call-client/src-tauri/icons/Square150x150Logo.png and b/call-client/src-tauri/icons/Square150x150Logo.png differ diff --git a/call-client/src-tauri/icons/Square284x284Logo.png b/call-client/src-tauri/icons/Square284x284Logo.png index 16569b4..061982d 100644 Binary files a/call-client/src-tauri/icons/Square284x284Logo.png and b/call-client/src-tauri/icons/Square284x284Logo.png differ diff --git a/call-client/src-tauri/icons/Square30x30Logo.png b/call-client/src-tauri/icons/Square30x30Logo.png index 9986d07..3cc9fc9 100644 Binary files a/call-client/src-tauri/icons/Square30x30Logo.png and b/call-client/src-tauri/icons/Square30x30Logo.png differ diff --git a/call-client/src-tauri/icons/Square310x310Logo.png b/call-client/src-tauri/icons/Square310x310Logo.png index 4bc54e0..a95c5e0 100644 Binary files a/call-client/src-tauri/icons/Square310x310Logo.png and b/call-client/src-tauri/icons/Square310x310Logo.png differ diff --git a/call-client/src-tauri/icons/Square44x44Logo.png b/call-client/src-tauri/icons/Square44x44Logo.png index fdec1a7..6253bc0 100644 Binary files a/call-client/src-tauri/icons/Square44x44Logo.png and b/call-client/src-tauri/icons/Square44x44Logo.png differ diff --git a/call-client/src-tauri/icons/Square71x71Logo.png b/call-client/src-tauri/icons/Square71x71Logo.png index 7b6d478..2b49aef 100644 Binary files a/call-client/src-tauri/icons/Square71x71Logo.png and b/call-client/src-tauri/icons/Square71x71Logo.png differ diff --git a/call-client/src-tauri/icons/Square89x89Logo.png b/call-client/src-tauri/icons/Square89x89Logo.png index a2b7389..22fc5e6 100644 Binary files a/call-client/src-tauri/icons/Square89x89Logo.png and b/call-client/src-tauri/icons/Square89x89Logo.png differ diff --git a/call-client/src-tauri/icons/StoreLogo.png b/call-client/src-tauri/icons/StoreLogo.png index bd2ab9b..cf2cf55 100644 Binary files a/call-client/src-tauri/icons/StoreLogo.png and b/call-client/src-tauri/icons/StoreLogo.png differ diff --git a/call-client/src-tauri/icons/call_icon.png b/call-client/src-tauri/icons/call_icon.png index eaea278..11be783 100644 Binary files a/call-client/src-tauri/icons/call_icon.png and b/call-client/src-tauri/icons/call_icon.png differ diff --git a/call-client/src-tauri/icons/icon.icns b/call-client/src-tauri/icons/icon.icns index 3abe096..c8349c4 100644 Binary files a/call-client/src-tauri/icons/icon.icns and b/call-client/src-tauri/icons/icon.icns differ diff --git a/call-client/src-tauri/icons/icon.ico b/call-client/src-tauri/icons/icon.ico index 6a1e361..56a7cfc 100644 Binary files a/call-client/src-tauri/icons/icon.ico and b/call-client/src-tauri/icons/icon.ico differ diff --git a/call-client/src-tauri/icons/icon.png b/call-client/src-tauri/icons/icon.png index 9ee5135..1b520fa 100644 Binary files a/call-client/src-tauri/icons/icon.png and b/call-client/src-tauri/icons/icon.png differ diff --git a/call-client/src-tauri/tauri.conf.json b/call-client/src-tauri/tauri.conf.json index cf1a7d5..4ee0e83 100644 --- a/call-client/src-tauri/tauri.conf.json +++ b/call-client/src-tauri/tauri.conf.json @@ -53,7 +53,12 @@ "bundleMediaFramework": false }, "icon": [ - "icons/call_icon.png" + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico", + "icons/icon.png" ] } }