处理ios18从其他app用自己键盘拉起主app的bug

其他问题
2025-11-24 19:58:19 +08:00
parent 8e93f8f86f
commit 15e37841bb
20 changed files with 264 additions and 88 deletions
--- a/CustomKeyboard/CustomKeyboard.entitlements
+++ b/CustomKeyboard/CustomKeyboard.entitlements
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:app.tknb.net</string>
+	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
 		<string>group.com.loveKey.nyx</string>
--- a/CustomKeyboard/KeyboardViewController.m
+++ b/CustomKeyboard/KeyboardViewController.m
@@ -16,7 +16,7 @@
 #import "KBFullAccessManager.h"
 #import "KBSkinManager.h"
 #import "KBSkinInstallBridge.h"
-#import "KBExtensionAppLauncher.h"
+#import "KBHostAppLauncher.h"

 // 提前声明一个类别，使编译器在 static 回调中识别 kb_consumePendingShopSkin 方法。
@interface KeyboardViewController (KBSkinShopBridge)
@@ -213,21 +213,26 @@ static void KBSkinInstallNotificationCallback(CFNotificationCenterRef center,
        [self showFunctionPanel:NO];
        return;
    }
+    
+//    // 1. 构造充值入口的通用链接（UL）和自定义 Scheme：
+//    //    - 当前复用 /login 路径，通过 entry=recharge 区分场景：
+//    //      https://app.tknb.net/ul/login?src=keyboard&entry=recharge
+//    //    - 若宿主拒绝或 UL 配置异常，则回退到 kbkeyboardAppExtension://recharge?src=keyboard
+//    NSString *ulStr = [NSString stringWithFormat:@"%@?src=keyboard&entry=recharge", KB_UL_RECHARGE];
+//    NSURL *ul = [NSURL URLWithString:ulStr];
+//    
+    NSString *schemeStr = [NSString stringWithFormat:@"%@://recharge?src=keyboard", KB_APP_SCHEME];
+    NSURL *scheme = [NSURL URLWithString:schemeStr];
+//    
+//    if (!ul && !scheme) { return; }
+//
+    // 从当前视图作为起点，通过响应链找到 UIApplication 再调起主 App
+    BOOL ok = [KBHostAppLauncher openHostAppURL:scheme fromResponder:self.view];

-    // 1. 构造自定义 scheme：kbkeyboardAppExtension://recharge?src=keyboard
-    NSString *urlStr = [NSString stringWithFormat:@"%@://recharge?src=keyboard", KB_APP_SCHEME];
-    NSURL *scheme = [NSURL URLWithString:urlStr];
-    if (!scheme) return;
-
-    // 2. 通过统一工具封装：extensionContext + 响应链兜底
-    [KBExtensionAppLauncher openScheme:scheme
-                  usingInputController:self
-                               source:self.view
-                           completion:^(BOOL success) {
-        if (!success) {
-            [KBHUD showInfo:KBLocalized(@"请切换到主App完成充值")];
-        }
-    }];
+       if (!ok) {
+           // 失败兜底：给个文案提示
+           // 比如：请回到桌面手动打开 XXX App 进行设置/充值
+       }
 }

 - (void)keyBoardMainViewDidTapSettings:(KBKeyBoardMainView *)keyBoardMainView {
--- a/CustomKeyboard/View/KBFullAccessGuideView.m
+++ b/CustomKeyboard/View/KBFullAccessGuideView.m
@@ -7,7 +7,7 @@
 #import "Masonry.h"
 #import "KBResponderUtils.h" // 统一查找 UIInputViewController 的工具
 #import "KBHUD.h"
-#import "KBExtensionAppLauncher.h"
+#import "KBHostAppLauncher.h"

@interface KBFullAccessGuideView ()
@property (nonatomic, strong) UIControl *backdrop;
@@ -157,31 +157,20 @@
 #pragma mark - Actions

 // 工具方法已提取到 KBResponderUtils.h
-// 打开主 App，引导用户去系统设置开启完全访问：优先 Scheme，失败再试 UL；仍失败则提示手动路径。
+// 打开主 App，引导用户去系统设置开启完全访问：通过宿主 UIApplication + 自定义 Scheme 拉起。
 - (void)onTapGoEnable {
    UIInputViewController *ivc = KBFindInputViewController(self);
-    if (!ivc) { [self dismiss]; return; }
+    // 找不到键盘控制器也可以尝试从自身 responder 链出发
+    UIResponder *start = ivc.view ?: (UIResponder *)self;

-    // 自定义 Scheme（App 里在 openURL 中转到设置页）
-    // 统一使用主 App 的自定义 Scheme
+    // 自定义 Scheme（AppDelegate 中处理 kbkeyboardAppExtension://settings）
    NSURL *scheme = [NSURL URLWithString:[NSString stringWithFormat:@"%@@//settings?src=kb_extension", KB_APP_SCHEME]];
-    // Universal Link（需 AASA/Associated Domains 配置且 KB_UL_BASE 与域名一致）
-    NSURL *ul = [NSURL URLWithString:[NSString stringWithFormat:@"%@?src=kb_extension", KB_UL_SETTINGS]];
-
-    __weak typeof(self) weakSelf = self;
-    [KBExtensionAppLauncher openPrimaryURL:scheme
-                               fallbackURL:ul
-                      usingInputController:ivc
-                                    source:self
-                                completion:^(BOOL ok) {
-        __strong typeof(weakSelf) strongSelf = weakSelf;
-        if (!strongSelf) return;
-        if (ok) {
-            [strongSelf dismiss];
-        } else {
-            NSString *showInfo = [NSString stringWithFormat:KBLocalized(@"Follow: Settings → General → Keyboard → Keyboards → %@ → Allow Full Access"),AppName];
-            [KBHUD showInfo:showInfo];
-        }
-    }];
+    BOOL ok = [KBHostAppLauncher openHostAppURL:scheme fromResponder:start];
+    if (ok) {
+        [self dismiss];
+    } else {
+        NSString *showInfo = [NSString stringWithFormat:KBLocalized(@"Follow: Settings → General → Keyboard → Keyboards → %@ → Allow Full Access"),AppName];
+        [KBHUD showInfo:showInfo];
+    }
 }
@end
--- a/CustomKeyboard/View/KBFunctionView.m
+++ b/CustomKeyboard/View/KBFunctionView.m
@@ -17,7 +17,7 @@
 #import "KBSkinManager.h"
 #import "KBAuthManager.h"          // 登录态判断（共享钥匙串）
 #import "KBULBridgeNotification.h"             // Darwin 通知常量（UL 已处理）
-#import "KBExtensionAppLauncher.h"
+#import "KBHostAppLauncher.h"
 #import "KBStreamTextView.h"  // 流式文本视图
 #import "KBStreamOverlayView.h" // 带关闭按钮的流式层
 #import "KBFunctionTagListView.h"
@@ -321,7 +321,7 @@ static NSString * const kKBStreamDemoURL = @"http://192.168.1.144:7529/api/demo/
        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
            [ivc.extensionContext openURL:ul completionHandler:^(__unused BOOL ok) {}];
        });
-        // 双路兜底：500ms 内未收到主 App 确认，则回退到自定义 Scheme
+        // 双路兜底：500ms 内未收到主 App 确认，则回退到自定义 Scheme（通过宿主 UIApplication 打开）
        self.kb_ulHandledFlag = NO;
        NSUInteger token = ++self.kb_ulSeq;
        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
@@ -329,14 +329,15 @@ static NSString * const kKBStreamDemoURL = @"http://192.168.1.144:7529/api/demo/
            if (self.kb_ulHandledFlag) return;       // 主 App 已确认处理
            NSURL *scheme = [NSURL URLWithString:[NSString stringWithFormat:@"%@://login?src=functionView&index=%ld&title=%@", KB_APP_SCHEME, (long)index, encodedTitle]];
            if (!scheme) return;
-            [KBExtensionAppLauncher openScheme:scheme
-                          usingInputController:ivc
-                                       source:self
-                                   completion:^(BOOL success) {
-                if (!success) {
-                    [KBHUD showInfo:KBLocalized(@"请切换到主App完成登录")];
-                }
-            }];
+            UIResponder *start = ivc.view ?: (UIResponder *)self;
+            // 让键盘失去焦点
+            [ivc dismissKeyboard];
+            BOOL ok = [KBHostAppLauncher openHostAppURL:scheme fromResponder:start];
+            if (!ok) {
+                [KBHUD showInfo:KBLocalized(@"请切换到主App完成登录")];
+            }else{
+              
+            }
        });
        return;
    }
@@ -378,13 +379,16 @@ static void KBULDarwinCallback(CFNotificationCenterRef center, void *observer, C
    if (!ul) return;

    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.05 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        NSURL *scheme = [NSURL URLWithString:[NSString stringWithFormat:@"%@@//login?src=functionView&index=%ld&title=%@", KB_APP_SCHEME, (long)indexPath.item, encodedTitle]];
-        [KBExtensionAppLauncher openPrimaryURL:ul
-                                   fallbackURL:scheme
-                          usingInputController:ivc
-                                        source:self
-                                    completion:^(BOOL success) {
-            if (!success) {
+        // 先尝试通过 extensionContext 打开 UL
+        [ivc.extensionContext openURL:ul completionHandler:^(BOOL ok) {
+            if (ok) {
+                return;
+            }
+            // UL 失败时，再通过宿主 UIApplication + 自定义 Scheme 兜底
+            NSURL *scheme = [NSURL URLWithString:[NSString stringWithFormat:@"%@@//login?src=functionView&index=%ld&title=%@", KB_APP_SCHEME, (long)indexPath.item, encodedTitle]];
+            UIResponder *start = ivc.view ?: (UIResponder *)self;
+            BOOL ok2 = [KBHostAppLauncher openHostAppURL:scheme fromResponder:start];
+            if (!ok2) {
                // 两条路都失败：大概率未开完全访问或宿主拦截。统一交由 Manager 引导。
                dispatch_async(dispatch_get_main_queue(), ^{
                    [[KBFullAccessManager shared] ensureFullAccessOrGuideInView:self];
@@ -402,6 +406,12 @@ static void KBULDarwinCallback(CFNotificationCenterRef center, void *observer, C
    // - iOS16+ 会在跨 App 首次读取时自动弹出系统权限弹窗；
    // - iOS15 及以下不会弹窗，直接返回内容；
    // 注意：不要在非用户触发的时机主动读取（如 viewDidLoad），否则会造成“立刻弹窗”的体验。
+    // 权限全部打开（键盘已启用 + 完全访问）。在扩展进程中仅需判断“完全访问”。
+    if (![[KBFullAccessManager shared] hasFullAccess]) {
+        // 未开启完全访问：保持原有引导路径
+        [[KBFullAccessManager shared] ensureFullAccessOrGuideInView:self];
+        return;
+    }
    UIPasteboard *pb = [UIPasteboard generalPasteboard];
    NSString *text = pb.string; // 读取纯文本（可能触发系统粘贴权限弹窗）