diff --git a/package.json b/package.json index eec376e5..1e3e30bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "stapxs-qq-lite", - "version": "2.7.12", + "version": "2.7.13", "private": false, "author": "Stapx Steve [林槐]", "description": "一个兼容 OneBot 的非官方网页版 QQ 客户端，使用 Vue 重制的全新版本。", diff --git a/public/favicon.ico b/public/favicon.ico index 14527b6b..21a2a76a 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/img/icons/icon-client-mac.icns b/public/img/icons/icon-client-mac.icns new file mode 100644 index 00000000..aafd61dd Binary files /dev/null and b/public/img/icons/icon-client-mac.icns differ diff --git a/public/img/icons/icon-client-others.png b/public/img/icons/icon-client-others.png new file mode 100644 index 00000000..594afa1c Binary files /dev/null and b/public/img/icons/icon-client-others.png differ diff --git a/public/img/icons/icon-for-fuck-apple.png b/public/img/icons/icon-for-fuck-apple.png index ce77c505..cc7d7208 100644 Binary files a/public/img/icons/icon-for-fuck-apple.png and b/public/img/icons/icon-for-fuck-apple.png differ diff --git a/public/img/icons/icon-maskable.png b/public/img/icons/icon-maskable.png index cb8ff7e0..70a1e1ca 100644 Binary files a/public/img/icons/icon-maskable.png and b/public/img/icons/icon-maskable.png differ diff --git a/public/img/icons/icon.icns b/public/img/icons/icon.icns deleted file mode 100644 index 8376da88..00000000 Binary files a/public/img/icons/icon.icns and /dev/null differ diff --git a/public/img/icons/icon.png b/public/img/icons/icon.png index a5f1fb80..f833a987 100644 Binary files a/public/img/icons/icon.png and b/public/img/icons/icon.png differ diff --git a/public/img/icons/icon.svg b/public/img/icons/icon.svg index 367a78a6..87c711a4 100644 --- a/public/img/icons/icon.svg +++ b/public/img/icons/icon.svg @@ -1,34 +1,10 @@ - - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/src/assets/css/options.css b/src/assets/css/options.css index e581fcfa..ac065e73 100644 --- a/src/assets/css/options.css +++ b/src/assets/css/options.css @@ -57,6 +57,9 @@ .logo-card>svg { width: 25%; } +.logo-card>svg>path:first-child { + fill: var(--color-main); +} .logo-card>a { color: var(--color-font-1); diff --git a/src/components/AboutPan.vue b/src/components/AboutPan.vue index 0d97f229..258d254c 100644 --- a/src/components/AboutPan.vue +++ b/src/components/AboutPan.vue @@ -8,34 +8,15 @@
- - - - - - - - - - - - - - - - - - - - + + + + + + + + +
{{ $t('name') }} diff --git a/src/components/DepPan.vue b/src/components/DepPan.vue index 14f26517..ea0491dd 100644 --- a/src/components/DepPan.vue +++ b/src/components/DepPan.vue @@ -22,11 +22,11 @@
-
aMap高德地图
+
aMap高德地图
-
Border Card UIbcui.js
+
Border Card UIbcui.js
Apache 2.0
@@ -40,7 +40,7 @@
-
ServiceLogosvue.js logo
+
ServiceLogosvue.js logo
@@ -148,11 +148,13 @@ export default defineComponent({ .dept > div > svg { height: 15px; } -.dept > div > header > span { +.dept > div > header > div:not(:first-child) { + display: flex; + flex-direction: column; +} +.dept > div > header > div > span { font-size: 0.7rem; color: var(--color-font-2); - margin-left: 10px; - } .dept > div > div { background: var(--color-main); diff --git a/src/function/electron/ipc.ts b/src/function/electron/ipc.ts index 966e27c4..9cfa0162 100644 --- a/src/function/electron/ipc.ts +++ b/src/function/electron/ipc.ts @@ -178,6 +178,16 @@ export function regIpcListener() { }) } }) + // 运行命令 + ipcMain.handle('sys:runCommand', async (event, cmd) => { + try { + const info = await runCommand(cmd) + const str = info.stdout as string + return { success: true, message: str } + } catch(ex) { + return { success: false, message: (ex as Error).message } + } + }) // Windows：闪烁状态栏图标 ipcMain.on('win:flashWindow', () => { diff --git a/src/pages/options/OptDev.vue b/src/pages/options/OptDev.vue index 89ed3877..11671173 100644 --- a/src/pages/options/OptDev.vue +++ b/src/pages/options/OptDev.vue @@ -255,6 +255,38 @@ export default defineComponent({ info += ` ${get[name][0]} -> ${get[name][1]}\n` }) } + // 获取安装信息，这儿主要判断几种已提交的包管理安装方式 + if(runtimeData.tags.isElectron && runtimeData.reader && runtimeData.tags.release) { + switch(process.platform) { + case 'darwin': { + // homebrew + const brewInfo = await runtimeData.reader.invoke('sys:runCommand', 'brew list --cask stapxs-qq-lite') + if(brewInfo.success) { + info += ` Install Type -> homebrew\n` + } + break; + } + case 'linux': { + // archlinux + if((runtimeData.tags.release.toLowerCase()).indexOf('arch') > 0) { + let pacmanInfo = await runtimeData.reader.invoke('sys:runCommand', 'pacman -Q stapxs-qq-lite-bin') + if(pacmanInfo.success) { + info += ` Install Type -> aur\n` + } else { + // 也有可能是 stapxs-qq-lite，这是我自己打的原生包 + pacmanInfo = await runtimeData.reader.invoke('sys:runCommand', 'pacman -Q stapxs-qq-lite') + if(pacmanInfo.success) { + info += ` Install Type -> pacman\n` + } + } + } + break; + } + default: { + info += ` Install Type -> raw\n` + } + } + } info += `Application Info:\n` info += ` Uptime -> ${new Date().getTime() - uptime} ms\n` diff --git a/src/pages/options/OptView.vue b/src/pages/options/OptView.vue index 12dd07f7..3ec267a4 100644 --- a/src/pages/options/OptView.vue +++ b/src/pages/options/OptView.vue @@ -133,7 +133,7 @@
{{ $t('option_view_view') }}
-
+
{{ $t('option_view_initial_scale') }} diff --git a/vue.config.js b/vue.config.js index 299dd4b0..0e19cca7 100644 --- a/vue.config.js +++ b/vue.config.js @@ -127,7 +127,7 @@ module.exports = { } ], appId: 'com.stapxs.qqweb', - icon: 'public/img/icons/icon.png', + icon: 'public/img/icons/icon-client-others.png', legalTrademarks: 'Copyright © 2022-2024 Stapx Steve [林槐]', publisherName: 'stapxs', }, @@ -140,12 +140,12 @@ module.exports = { } ], category: 'public.app-category.social-networking', - icon: 'public/img/icons/icon.icns', + icon: 'public/img/icons/icon-client-mac.icns', darkModeSupport: true }, dmg: { background: 'public/img/dmg-bg.png', - icon: 'public/img/icons/icon.icns', + icon: 'public/img/icons/icon-client-mac.icns', iconSize: 80, sign: false, contents: [