三天摸鱼两天放假

✨ 新的客户端图标！ 💄 一些布局优化 💩 没有了 💚 [build-electron]
Stapxs · Jun 21, 2024 · e0d1437 · e0d1437
1 parent bd80548
commit e0d1437
Show file tree

Hide file tree

Showing 16 changed files with 76 additions and 72 deletions.
diff --git 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
diff --git a/public/img/icons/icon-client-mac.icns b/public/img/icons/icon-client-mac.icns
diff --git a/public/img/icons/icon-client-others.png b/public/img/icons/icon-client-others.png
diff --git a/public/img/icons/icon-for-fuck-apple.png b/public/img/icons/icon-for-fuck-apple.png
diff --git a/public/img/icons/icon-maskable.png b/public/img/icons/icon-maskable.png
diff --git a/public/img/icons/icon.icns b/public/img/icons/icon.icns
diff --git a/public/img/icons/icon.png b/public/img/icons/icon.png
diff --git a/public/img/icons/icon.svg b/public/img/icons/icon.svg
diff --git 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
@@ -8,34 +8,15 @@
 <template>
     <div class="about-pan">
         <div id="logo-card" :class="'ss-card logo-card' + (showUI ? '' : ' hidd-sha')">
-            <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
-                y="0px" viewBox="0 0 1080 1080" style="enable-background:new 0 0 1080 1080;" xml:space="preserve">
-                <g id="圖層_2">
-                    <circle class="st0" cx="537" cy="543" r="537"></circle>
-                </g>
-                <g id="圖層_1">
-                    <path class="st1"
-                        d="M546.6,774.4c-46.5,0-89.1-15.5-116.6-38.8c-13.9,4.2-31.8,10.9-43,19.2c-9.6,7.1-8.4,14.4-6.7,17.3c7.6,12.9,130.7,8.2,166.3,4.2V774.4z M546.6,774.4c46.5,0,89.1-15.5,116.6-38.8c13.9,4.2,31.8,10.9,43,19.2c9.6,7.1,8.4,14.4,6.7,17.3c-7.6,12.9-130.7,8.2-166.3,4.2V774.4z">
-                    </path>
-                    <path class="st1"
-                        d="M546.9,496c76.7-0.5,138.2-15.4,159-21.1c5-1.4,7.6-3.8,7.6-3.8c0-0.7,0.3-12.5,0.3-18.6c0-102.4-48.3-205.3-167.3-205.3c-118.9,0-167.3,102.9-167.3,205.3c0,6.1,0.3,17.9,0.3,18.6c0,0,2.2,2.3,6.1,3.4c19.2,5.4,81.9,20.9,160.5,21.5H546.9z M755.4,581.3c-4.8-15.3-11.2-33.2-17.8-50.3c0,0-3.8-0.5-5.7,0.1c-59,17.1-130.5,28.1-185,27.4h-0.6c-54.2,0.6-125.2-10.1-184-27.1c-2.2-0.6-6.7-0.4-6.7-0.4c-6.6,17.1-13.1,35-17.8,50.3c-22.7,73-15.3,103.2-9.7,103.9c12,1.5,46.7-54.9,46.7-54.9c0,57.3,51.7,145.3,170.2,146.1h3.1c118.5-0.8,170.2-88.8,170.2-146.1c0,0,34.7,56.4,46.7,54.9C770.7,684.5,778,654.3,755.4,581.3">
-                    </path>
-                    <path class="st1"
-                        d="M504.3,398.5c-16.1,0.7-29.9-17.6-30.8-41c-0.9-23.4,11.5-42.9,27.6-43.6c16.1-0.7,29.9,17.6,30.8,41C532.8,378.3,520.4,397.8,504.3,398.5 M619.7,357.5c-0.9,23.4-14.6,41.7-30.8,41c-16.1-0.7-28.5-20.3-27.6-43.6c0.9-23.4,14.6-41.7,30.8-41C608.2,314.6,620.6,334.1,619.7,357.5 M322.4,247.2">
-                    </path>
-                    <path class="st1"
-                        d="M524.1,357.9c0.7,9.2-4.3,17.4-11.3,18.3c-7,0.9-13.2-5.9-14-15.1c-0.7-9.2,4.3-17.4,11.3-18.3C517.1,341.9,523.4,348.6,524.1,357.9 M568.4,360.9c1.4-2.6,11.1-16,31.2-11.1c5.3,1.3,7.7,3.2,8.2,3.9c0.8,1.1,1,2.7,0.2,4.8c-1.5,4.2-4.7,4.1-6.4,3.2c-1.1-0.5-15.1-9.9-28,4.1c-0.9,1-2.5,1.3-4,0.1C568.2,364.8,567.6,362.5,568.4,360.9">
-                    </path>
-                    <path class="st1"
-                        d="M546.9,555.1h-0.6c-37.1,0.4-82-4.5-125.5-13c-3.7,21.6-6,48.7-4,81c4.9,81.7,53.4,133.1,128.3,133.8h3c74.9-0.7,123.4-52.1,128.3-133.8c1.9-32.3-0.3-59.4-4-81C628.9,550.7,584,555.6,546.9,555.1">
-                    </path>
-                    <path class="st1"
-                        d="M441.4,548.3v80.4c0,0,36.8,7.4,73.7,2.3v-74.2C491.7,555.5,466.5,552.6,441.4,548.3">
-                    </path>
-                    <path class="st1"
-                        d="M713.6,471.1c0,0-71.6,22.6-166.7,23.3h-0.6c-94.9-0.6-166.4-23.2-166.7-23.3l-24,59.9c60,18.1,134.4,29.8,190.6,29.1h0.6c56.2,0.7,130.6-11,190.7-29.1L713.6,471.1z">
-                    </path>
-                </g>
+            <svg viewBox="0 0 1080 1080" fill="none" xmlns="http://www.w3.org/2000/svg">
+                <path d="M537 1080C833.577 1080 1074 839.577 1074 543C1074 246.423 833.577 6 537 6C240.423 6 0 246.423 0 543C0 839.577 240.423 1080 537 1080Z"/>
+                <path d="M540.28 803.2C493.78 803.2 451.18 787.7 423.68 764.4C409.78 768.6 391.88 775.3 380.68 783.6C371.08 790.7 372.28 798 373.98 800.9C381.58 813.8 504.68 809.1 540.28 805.1V803.2ZM540.28 803.2C586.78 803.2 629.38 787.7 656.88 764.4C670.78 768.6 688.68 775.3 699.88 783.6C709.48 790.7 708.28 798 706.58 800.9C698.98 813.8 575.88 809.1 540.28 805.1V803.2Z" fill="#F8F9FA"/>
+                <path d="M540.58 524.8C617.28 524.3 678.78 509.4 699.58 503.7C704.58 502.3 707.18 499.9 707.18 499.9C707.18 499.2 707.48 487.4 707.48 481.3C707.48 378.9 659.18 276 540.18 276C421.28 276 372.88 378.9 372.88 481.3C372.88 487.4 373.18 499.2 373.18 499.9C373.18 499.9 375.38 502.2 379.28 503.3C398.48 508.7 461.18 524.2 539.78 524.8H540.58ZM749.08 610.1C744.28 594.8 737.88 576.9 731.28 559.8C731.28 559.8 727.48 559.3 725.58 559.9C666.58 577 595.08 588 540.58 587.3H539.98C485.78 587.9 414.78 577.2 355.98 560.2C353.78 559.6 349.28 559.8 349.28 559.8C342.68 576.9 336.18 594.8 331.48 610.1C308.78 683.1 316.18 713.3 321.78 714C333.78 715.5 368.48 659.1 368.48 659.1C368.48 716.4 420.18 804.4 538.68 805.2H541.78C660.28 804.4 711.98 716.4 711.98 659.1C711.98 659.1 746.68 715.5 758.68 714C764.38 713.3 771.68 683.1 749.08 610.1Z" fill="#F8F9FA"/>
+                <path d="M497.98 427.3C481.88 428 468.08 409.7 467.18 386.3C466.28 362.9 478.68 343.4 494.78 342.7C510.88 342 524.68 360.3 525.58 383.7C526.48 407.1 514.08 426.6 497.98 427.3ZM613.38 386.3C612.48 409.7 598.78 428 582.58 427.3C566.48 426.6 554.08 407 554.98 383.7C555.88 360.3 569.58 342 585.78 342.7C601.88 343.4 614.28 362.9 613.38 386.3Z" fill="#F8F9FA"/>
+                <path d="M517.78 386.7C518.48 395.9 513.48 404.1 506.48 405C499.48 405.9 493.28 399.1 492.48 389.9C491.78 380.7 496.78 372.5 503.78 371.6C510.78 370.7 517.08 377.4 517.78 386.7ZM562.08 389.7C563.48 387.1 573.18 373.7 593.28 378.6C598.58 379.9 600.98 381.8 601.48 382.5C602.28 383.6 602.48 385.2 601.68 387.3C600.18 391.5 596.98 391.4 595.28 390.5C594.18 390 580.18 380.6 567.28 394.6C566.38 395.6 564.78 395.9 563.28 394.7C561.88 393.6 561.28 391.3 562.08 389.7Z" fill="#F8F9FA"/>
+                <path d="M540.58 583.9H539.98C502.88 584.3 457.98 579.4 414.48 570.9C410.78 592.5 408.48 619.6 410.48 651.9C415.38 733.6 463.88 785 538.78 785.7H541.78C616.68 785 665.18 733.6 670.08 651.9C671.98 619.6 669.78 592.5 666.08 570.9C622.58 579.5 577.68 584.4 540.58 583.9Z" fill="#F8F9FA"/>
+                <path d="M435.08 577.1V657.5C435.08 657.5 471.88 664.9 508.78 659.8V585.6C485.38 584.3 460.18 581.4 435.08 577.1Z" fill="#E9EBED"/>
+                <path d="M707.28 499.9C707.28 499.9 635.68 522.5 540.58 523.2H539.98C445.08 522.6 373.58 500 373.28 499.9L349.28 559.8C409.28 577.9 483.68 589.6 539.88 588.9H540.48C596.68 589.6 671.08 577.9 731.18 559.8L707.28 499.9Z" fill="#E9EBED"/>
             </svg>
             <div>
                 <span>{{ $t('name') }}</span>

diff --git a/src/components/DepPan.vue b/src/components/DepPan.vue
@@ -22,11 +22,11 @@
             </div>
             <div class="dept">
                 <div class="ss-card jump-card" @click="openLink('https://lbs.amap.com/api/javascript-api/summary')">
-                    <header><div></div>aMap<span>高德地图</span></header>
+                    <header><div></div><div>aMap<span>高德地图</span></div></header>
                     <font-awesome-icon :icon="['fas', 'angle-right']"/>
                 </div>
                 <div class="ss-card jump-card" @click="openLink('https://github.com/Stapxs/Border-Card-UI/tree/js-bcui')">
-                    <header><div></div>Border Card UI<span>bcui.js</span></header>
+                    <header><div></div><div>Border Card UI<span>bcui.js</span></div></header>
                     <div>Apache 2.0</div>
                     <font-awesome-icon :icon="['fas', 'angle-right']"/>
                 </div>
@@ -40,7 +40,7 @@
                     <font-awesome-icon :icon="['fas', 'angle-right']"/>
                 </div>
                 <div class="ss-card jump-card" @click="openLink('https://github.com/SAWARATSUKI/KawaiiLogos')">
-                    <header><div></div>ServiceLogos<span>vue.js logo</span></header>
+                    <header><div></div><div>ServiceLogos<span>vue.js logo</span></div></header>
                     <font-awesome-icon :icon="['fas', 'angle-right']"/>
                 </div>
             </div>
@@ -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
@@ -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
@@ -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
@@ -133,7 +133,7 @@
         </div>
         <div class="ss-card">
             <header>{{ $t('option_view_view') }}</header>
-            <div class="opt-item">
+            <div class="opt-item" v-if="isMobile()">
                 <font-awesome-icon :icon="['fas', 'up-down-left-right']" />
                 <div>
                     <span>{{ $t('option_view_initial_scale') }}</span>

diff --git 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: [