#195 缝缝补补又一版

✨ 更完善的群通知设置 <- #185 ✨ 现在你可以关闭群收纳盒，使群消息也全部显示在消息列表中 <- #185 🐛 修正通知面板显示异常的问题 <- #194 🐛 新发出的消息无法被正常预览 <- #188 🐛 修正了连接失败未重置加载中提示的问题 🐛 修正了群主没法踢管理员的问题 <- #189 🐛 修正 at 你、at 全体文本 i18n 异常的问题 🐛 修正消息列表排序刷新不及时的问题 🎨 优化在群消息盒中开启置顶的显示逻辑 🎨 优化中途切换开关群收纳盒的显示逻辑 🎨 调整高亮信息显示逻辑 💩 调整 mac 平台编译顺序便于测试
Stapxs · Feb 17, 2025 · 5a230cb · 5a230cb
2 parents 28f57b1 + 85aeb88
commit 5a230cb
Show file tree

Hide file tree

Showing 21 changed files with 284 additions and 146 deletions.
diff --git a/electron-builder.yml b/electron-builder.yml
@@ -30,8 +30,8 @@ win:
 # macOS 配置
 mac:
     target:
-        - { target: dmg, arch: x64 }
         - { target: dmg, arch: arm64 }
+        - { target: dmg, arch: x64 }
     entitlementsInherit: build/entitlements.mac.plist
     icon: build/icon-client-mac.icns
     darkModeSupport: true
@@ -55,14 +55,14 @@ linux:
         - { target: tar.gz, arch: arm64 }
     maintainer: Stapx Steve [林槐]
     vendor: Stapxs Steve Team
-    synopsis: 一个兼容 OneBot 的非官方网页版 QQ 客户端。
+    synopsis: 一个兼容 OneBot 协议的非官方 QQ 全平台客户端实现。
     category: Network
     mimeTypes: [ application/x-stapxs-qq-lite ]
     desktop:
         Type: Application
         Name: Stapxs QQ Lite
         GenericName: Stapxs QQ Lite Electron 客户端
-        Comment: 一个兼容 OneBot 的非官方网页版 QQ 客户端。
+        Comment: 一个兼容 OneBot 协议的非官方 QQ 全平台客户端实现。
         Terminal: false
         Category: Network
         Icon: stapxs-qq-lite

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "stapxs-qq-lite",
-    "version": "3.0.5",
+    "version": "3.0.6",
     "private": false,
     "author": "Stapx Steve [林槐]",
-    "description": "一个兼容 OneBot 协议的非官方 QQ 全平台客户端实现",
+    "description": "一个兼容 OneBot 协议的非官方 QQ 全平台客户端实现。",
     "homepage": "http://github.com/Stapxs/Stapxs-QQ-Lite-2.0",
     "license": "Apache-2.0",
     "main": "./out/main/index.js",

diff --git a/scripts/clear-dist.sh b/scripts/clear-dist.sh
@@ -1,11 +1,18 @@
 dirs=(
+    # web
     "dist"
+    "stats.html"
+    # electron
+    "out"
     "dist_electron"
+    # capacitor
     "dist_capacitor"
-    "out"
+    # npx
     "ssqq.npx-web-quick-start/bin"
     "ssqq.npx-web-quick-start/node_modules"
-    "stats.html"
+    # android
+    "src/mobile/android/app/release"
+    "src/mobile/android/app/debug"
 )
 
 for dir in ${dirs[@]}; do

diff --git a/src/mobile/android/app/app.properties b/src/mobile/android/app/app.properties
@@ -1,2 +1,2 @@
-versionName=3.0.5
-versionCode=3000005
+versionName=3.0.6
+versionCode=3000006
diff --git a/src/mobile/ios/App/App/Info.plist b/src/mobile/ios/App/App/Info.plist
@@ -17,9 +17,9 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>3.0.5</string>
+    <string>3.0.6</string>
     <key>CFBundleVersion</key>
-    <string>3.0.5</string>
+    <string>3.0.6</string>
     <key>LSRequiresIPhoneOS</key>
     <true/>
     <key>UILaunchStoryboardName</key>

diff --git a/src/mobile/ios/App/Settings.bundle/Root.plist b/src/mobile/ios/App/Settings.bundle/Root.plist
@@ -24,7 +24,7 @@
         <key>Key</key>
         <string>version</string>
         <key>DefaultValue</key>
-        <string>3.0.5</string>
+        <string>3.0.6</string>
         <key>IsSecure</key>
         <false/>
         <key>KeyboardType</key>

diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
@@ -95,7 +95,12 @@
                                 <button id="connect_btn" class="ss-button" type="submit"
                                     :disabled="loginInfo.creating"
                                     @mousemove="afd">
-                                    {{ loginInfo.creating ? $t('连接中') : $t('连接') }}
+                                    <template v-if="!loginInfo.creating">
+                                        {{ $t('连接') }}
+                                    </template>
+                                    <template v-else>
+                                        <font-awesome-icon :icon="['fas', 'spinner']" spin />
+                                    </template>
                                 </button>
                             </form>
                             <a href="https://github.com/Stapxs/Stapxs-QQ-Lite-2.0#%E5%BF%AB%E9%80%9F%E4%BD%BF%E7%94%A8"
@@ -290,8 +295,11 @@ export default defineComponent({
     },
     mounted() {
         const logger = new Logger()
-        window.moYu = () => {
-            return 'undefined'
+        window.moYu = () => { return '\x75\x6e\x64\x65\x66\x69\x6e\x65\x64' }
+        window.onbeforeunload = () => {
+            if (runtimeData.tags.isElectron) {
+                Connector.close()
+            }
         }
         // 页面加载完成后
         window.onload = async () => {
@@ -644,8 +652,6 @@ export default defineComponent({
                     'getGroupMemberList',
                 )
             }
-            // 刷新系统消息
-            Connector.send('get_system_msg', {}, 'getSystemMsg')
 
             // 清理通知
             if (runtimeData.plantform.reader) {

diff --git a/src/renderer/src/assets/css/append/append_new.css b/src/renderer/src/assets/css/append/append_new.css
@@ -286,11 +286,11 @@ body {
     font-size: 0.7rem;
 }
 .contributors-card > div > div {
-    min-width: 25px;
-    min-height: 25px;
-    margin-top: 5px;
-    margin-bottom: 5px;
+    min-width: calc(20% - 10px);
+    aspect-ratio: 1;
+    margin: 5px;
 }
+
 .contributors-card {
     width: calc(100% - 20px);
     min-height: 0;

diff --git a/src/renderer/src/assets/css/options.css b/src/renderer/src/assets/css/options.css
@@ -158,25 +158,25 @@
     flex-wrap: wrap;
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    width: 100%;
 }
 .contributors-card > div > div {
+    min-width: calc(20% - 20px);
+    aspect-ratio: 1;
+    margin: 10px;
     background-size: 100%;
     border-radius: 35px;
-    margin-right: 10px;
-    min-height: 35px;
-    min-width: 35px;
-    margin-top: 10px;
-    margin-bottom: 10px;
     cursor: pointer;
 }
 .contributors-card > div > div.me {
     outline: 2px solid var(--color-main);
     border: 1px solid var(--color-card-1);
+    box-sizing: border-box;
 }
 .contributors-card > div > div.super-thanks {
     outline: 2px dashed var(--color-main);
     border: 1px solid var(--color-card-1);
+    box-sizing: border-box;
 }
 
 .opt-tab {

diff --git a/src/renderer/src/assets/l10n/zh-CAT.po b/src/renderer/src/assets/l10n/zh-CAT.po
@@ -119,12 +119,6 @@ msgstr "喵喵喵喵喵！"
 msgid "开发者选项"
 msgstr "工程喵选项"
 
-msgid "通知所有新消息"
-msgstr "通知左右新喵喵"
-
-msgid "让暴风雨来得更猛烈些吧！"
-msgstr "让喵喵风暴来得更猛烈些吧！"
-
 msgid "好嘛 …… 不烦你 ……"
 msgstr "不可以喵喵！"
 

diff --git a/src/renderer/src/assets/l10n/zh-CN.po b/src/renderer/src/assets/l10n/zh-CN.po
@@ -246,10 +246,10 @@ msgstr ""
 msgid "ReferenceError: moYu is not defined"
 msgstr ""
 
-msgid "通知所有新消息"
+msgid "关闭群收纳盒"
 msgstr ""
 
-msgid "让暴风雨来得更猛烈些吧！"
+msgid "全都放出来！全都放出来！"
 msgstr ""
 
 msgid "禁用通知"
@@ -834,7 +834,7 @@ msgstr ""
 msgid "确定要退出群聊吗？"
 msgstr ""
 
-msgid "留言"
+msgid "留言："
 msgstr ""
 
 msgid "请求加为好友"
@@ -991,10 +991,10 @@ msgid "别划了别划了被看见了啦"
 msgstr ""
 
 msgid "[有人@你]"
-msgstr ""
+msgstr "[有人{'@'}你]"
 
 msgid "[@全体]"
-msgstr ""
+msgstr "[{'@'}全体]"
 
 msgid "[特別关心]"
 msgstr ""
diff --git a/src/renderer/src/assets/l10n/zh-TW.po b/src/renderer/src/assets/l10n/zh-TW.po
@@ -246,11 +246,11 @@ msgstr "基本"
 msgid "ReferenceError: moYu is not defined"
 msgstr "ReferenceError: moYu is not defined"
 
-msgid "通知所有新消息"
-msgstr "通知所有新訊息"
+msgid "关闭群收纳盒"
+msgstr ""
 
-msgid "让暴风雨来得更猛烈些吧！"
-msgstr "讓暴風雨來得更猛烈些吧！"
+msgid "全都放出来！全都放出来！"
+msgstr ""
 
 msgid "禁用通知"
 msgstr "停用通知"
@@ -834,7 +834,7 @@ msgstr ""
 msgid "确定要退出群聊吗？"
 msgstr ""
 
-msgid "留言"
+msgid "留言："
 msgstr ""
 
 msgid "请求加为好友"

diff --git a/src/renderer/src/assets/l10n/zh-YUE.po b/src/renderer/src/assets/l10n/zh-YUE.po
@@ -246,11 +246,11 @@ msgstr "Info"
 msgid "ReferenceError: moYu is not defined"
 msgstr "小心老闆叫你 OT debug 囉"
 
-msgid "通知所有新消息"
-msgstr "通知所有訊息"
+msgid "关闭群收纳盒"
+msgstr ""
 
-msgid "让暴风雨来得更猛烈些吧！"
-msgstr "電 腦 大 爆 炸！！！"
+msgid "全都放出来！全都放出来！"
+msgstr ""
 
 msgid "禁用通知"
 msgstr "停用通知"
@@ -834,7 +834,7 @@ msgstr ""
 msgid "确定要退出群聊吗？"
 msgstr ""
 
-msgid "留言"
+msgid "留言："
 msgstr ""
 
 msgid "请求加为好友"

diff --git a/src/renderer/src/function/connect.ts b/src/renderer/src/function/connect.ts
@@ -77,9 +77,9 @@ export class Connector {
             sse.onmessage = (e) => {
                 this.onmessage(e.data)
             }
-            sse.onerror = (e) => {
+            sse.onerror = () => {
                 login.creating = false
-                popInfo.add(PopType.ERR, $t('连接失败') + ': ' + e.type, false)
+                popInfo.add(PopType.ERR, $t('连接不稳定'))
                 return
             }
             return
@@ -209,11 +209,13 @@ export class Connector {
                 break
             }
             default: {
+                login.creating = false
                 popInfo.add(PopType.ERR, $t('连接失败') + ': ' + code, false)
             }
         }
 
         logger.error(null, $t('连接失败') + ': ' + code)
+        login.creating = false
         login.status = false
     }