#165 十二月累积更新

✨ Android：图标切换功能
✨ iOS：图标切换功能、暗黑模式图标功能
🐛 修正空消息依旧触发消息预显的问题 <- #157
🐛 修正在 Web 端 URL 编码遗漏导致的主题面板加载失败的问题 <- #158
🐛 修正消息滚到底判定偶发不触发的问题
🐛 阻止反复点击已打开的聊天以避免计数器问题
🐛 调整一些布局错误 <- #156
♿ Capacitor：优化在移动设备平板上横竖屏样式切换的体验
♿ iOS：优化在 iPad 上的实体键盘、笔输入结构避让

package.json

@@ -1,6 +1,6 @@
 {
     "name": "stapxs-qq-lite",
-    "version": "3.0.1",
+    "version": "3.0.2",
     "private": false,
     "author": "Stapx Steve [林槐]",
     "description": "一个兼容 OneBot 的非官方网页版 QQ 客户端，使用 Vue 重制的全新版本。",

src/mobile/android/app/src/main/AndroidManifest.xml

@@ -20,6 +20,34 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity-alias
+            android:targetActivity=".MainActivity"
+            android:enabled="false"
+            android:icon="@mipmap/ic_launcher_capacitor"
+            android:name=".MainActivityCapacitor"
+            android:roundIcon="@mipmap/ic_launcher_capacitor_round"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+        <activity-alias
+            android:targetActivity=".MainActivity"
+            android:enabled="false"
+            android:icon="@mipmap/ic_launcher_napcat"
+            android:name=".MainActivityNapcat"
+            android:roundIcon="@mipmap/ic_launcher_napcat_round"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
+            android:theme="@style/AppTheme.NoActionBarLaunch"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
 
         <provider
             android:name="androidx.core.content.FileProvider"

src/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_capacitor.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_capacitor_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_capacitor_foreground" android:inset="16.7%" />
+    </foreground>
+</adaptive-icon>

src/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_capacitor_round.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_capacitor_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_capacitor_foreground" android:inset="16.7%" />
+    </foreground>
+</adaptive-icon>

src/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_napcat.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_napcat_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_napcat_foreground" android:inset="16.7%" />
+    </foreground>
+</adaptive-icon>

src/mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_napcat_round.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background>
+        <inset android:drawable="@mipmap/ic_launcher_napcat_background" android:inset="16.7%" />
+    </background>
+    <foreground>
+        <inset android:drawable="@mipmap/ic_launcher_napcat_foreground" android:inset="16.7%" />
+    </foreground>
+</adaptive-icon>

src/mobile/ios/App/App.xcodeproj/project.pbxproj

@@ -15,6 +15,7 @@
 		504EC3121FED79650016851F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 504EC3101FED79650016851F /* LaunchScreen.storyboard */; };
 		50B271D11FEDC1A000F3C39B /* public in Resources */ = {isa = PBXBuildFile; fileRef = 50B271D01FEDC1A000F3C39B /* public */; };
 		A084ECDBA7D38E1E42DFC39D /* Pods_App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */; };
+		A28365522D1C071C009ED84C /* UIViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A28365512D1C0717009ED84C /* UIViewController.swift */; };
 		A2E5D1EB2D1297860071C6EF /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = A2E5D1EA2D1297860071C6EF /* Settings.bundle */; };
 /* End PBXBuildFile section */
 
@@ -28,6 +29,7 @@
 		504EC3111FED79650016851F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		504EC3131FED79650016851F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50B271D01FEDC1A000F3C39B /* public */ = {isa = PBXFileReference; lastKnownFileType = folder; path = public; sourceTree = "<group>"; };
+		A28365512D1C0717009ED84C /* UIViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UIViewController.swift; sourceTree = "<group>"; };
 		A2E5D1EA2D1297860071C6EF /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
 		AF277DCFFFF123FFC6DF26C7 /* Pods_App.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App.release.xcconfig"; path = "Pods/Target Support Files/Pods-App/Pods-App.release.xcconfig"; sourceTree = "<group>"; };
@@ -76,6 +78,7 @@
 		504EC3061FED79650016851F /* App */ = {
 			isa = PBXGroup;
 			children = (
+				A28365512D1C0717009ED84C /* UIViewController.swift */,
 				50379B222058CBB4000EE86E /* capacitor.config.json */,
 				504EC3071FED79650016851F /* AppDelegate.swift */,
 				504EC30B1FED79650016851F /* Main.storyboard */,
@@ -213,6 +216,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				A28365522D1C071C009ED84C /* UIViewController.swift in Sources */,
 				504EC3081FED79650016851F /* AppDelegate.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -351,6 +355,7 @@
 			baseConfigurationReference = FC68EB0AF532CFC21C3344DD /* Pods-App.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = LZ4NKVK3NY;
@@ -374,6 +379,7 @@
 			baseConfigurationReference = AF51FD2D460BCFE21FA515B2 /* Pods-App.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = LZ4NKVK3NY;

src/mobile/ios/App/App/AppDelegate.swift

@@ -8,6 +8,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
+        UIViewController.initializeMethod()
         return true
     }
 

src/mobile/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,14 +1,39 @@
 {
-  "images": [
+  "images" : [
     {
-      "idiom": "universal",
-      "size": "1024x1024",
-      "filename": "[email protected]",
-      "platform": "ios"
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
     }
   ],
-  "info": {
-    "author": "xcode",
-    "version": 1
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
+

src/mobile/ios/App/App/Assets.xcassets/CapacitorAppIcon.appiconset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

src/mobile/ios/App/App/Assets.xcassets/NapcatAppIcon.appiconset/Contents.json

@@ -0,0 +1,36 @@
+{
+  "images" : [
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "tinted"
+        }
+      ],
+      "idiom" : "universal",
+      "platform" : "ios",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

src/mobile/ios/App/App/Info.plist

@@ -36,6 +36,8 @@
     </array>
     <key>UISupportedInterfaceOrientations~ipad</key>
     <array>
+      <string>UIInterfaceOrientationPortrait</string>
+      <string>UIInterfaceOrientationPortraitUpsideDown</string>
       <string>UIInterfaceOrientationLandscapeLeft</string>
       <string>UIInterfaceOrientationLandscapeRight</string>
     </array>

src/mobile/ios/App/App/UIViewController.swift

@@ -0,0 +1,46 @@
+//
+//  UIViewController.swift
+//  App
+//
+//  Created by 林小槐 on 2024/12/25.
+//
+
+import UIKit
+
+extension UIViewController {
+    public class func initializeMethod(){
+        if self != UIViewController.self{
+            return
+        }
+        DispatchQueue.once(token: "ChangeIcon") {
+            let orignal = class_getInstanceMethod(self, #selector(UIViewController.present(_:animated:completion:)))
+            let swizzling = class_getInstanceMethod(self, #selector(UIViewController.ssl_present(_:animated:completion:)))
+            if let old = orignal, let new = swizzling{
+                method_exchangeImplementations(old, new)
+            }
+        }
+    }
+    @objc private func ssl_present(_ viewControllerToPresent: UIViewController, animated flag: Bool, completion: (() -> Void)? = nil) {
+        if viewControllerToPresent is UIAlertController{
+            let vc = viewControllerToPresent as! UIAlertController
+            if vc.title == nil && vc.message == nil{
+                return
+            }
+        }
+        self.ssl_present(viewControllerToPresent, animated: flag, completion: completion)
+    }
+}
+extension DispatchQueue{
+    private static var _onceTracker = [String]()
+    public class func once(token: String, block:()->()){
+        objc_sync_enter(self)
+        defer{
+            objc_sync_exit(self)
+        }
+        if _onceTracker.contains(token){
+            return
+        }
+        _onceTracker.append(token)
+        block()
+    }
+}

src/renderer/src/App.vue

@@ -212,6 +212,7 @@
                 <img v-for="info in scope.images" :key="'imgView-' + info.index" :src="info.img_url">
             </template>
         </viewer>
+        <div id="mobile-css" />
     </div>
 </template>
 
@@ -226,21 +227,21 @@ import { Connector, login as loginInfo } from '@renderer/function/connect'
 import { Logger, popList, PopInfo, LogType } from '@renderer/function/base'
 import { runtimeData } from '@renderer/function/msg'
 import { BaseChatInfoElem } from '@renderer/function/elements/information'
+import { Notify } from './function/notify'
 import * as App from './function/utils/appUtil'
 
 import Options from '@renderer/pages/Options.vue'
 import Friends from '@renderer/pages/Friends.vue'
 import Messages from '@renderer/pages/Messages.vue'
 import Chat from '@renderer/pages/Chat.vue'
-import { Notify } from './function/notify'
 
 export default defineComponent({
     name: 'App',
     components: {
         Options,
         Friends,
         Messages,
-        Chat,
+        Chat
     },
     data() {
         return {

src/renderer/src/assets/css/append/append_new.css

@@ -288,8 +288,8 @@ body {
 .contributors-card > div > div {
     min-width: 25px;
     min-height: 25px;
-    margin-top: 0;
-    margin-bottom: 0;
+    margin-top: 5px;
+    margin-bottom: 5px;
 }
 .contributors-card {
     width: calc(100% - 20px);