zw/keyboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

封装跨应用拉起，

Browse Source
This commit is contained in:
CodeST
2025-11-21 18:26:02 +08:00
parent 0f4ca89060
commit fc87c545a0
11 changed files with 251 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
CustomKeyboard/View/KBFunctionView.m
View File

@@ -16,8 +16,8 @@
#import "KBFullAccessManager.h"
#import "KBSkinManager.h"
#import "KBAuthManager.h" // 登录态判断（共享钥匙串）
#import "KBULBridge.h" // Darwin 通知常量（UL 已处理）
#import "KBURLOpenBridge.h" // 兜底从扩展侧直接尝试 openURL:
#import "KBULBridgeNotification.h" // Darwin 通知常量（UL 已处理）
#import "KBExtensionAppLauncher.h"
#import "KBStreamTextView.h" // 流式文本视图
#import "KBStreamOverlayView.h" // 带关闭按钮的流式层
#import "KBFunctionTagListView.h"
@@ -329,16 +329,11 @@ 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;
[ivc.extensionContext openURL:scheme completionHandler:^(__unused BOOL ok2) {
if (ok2) return;
BOOL bridged = NO;
@try {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability"
bridged = [KBURLOpenBridge openURLViaResponder:scheme from:self];
#pragma clang diagnostic pop
} @catch (__unused NSException *e) { bridged = NO; }
if (!bridged) {
[KBExtensionAppLauncher openScheme:scheme
usingInputController:ivc
source:self
completion:^(BOOL success) {
if (!success) {
[KBHUD showInfo:KBLocalized(@"请切换到主App完成登录")];
}
}];
@@ -383,29 +378,18 @@ 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(), ^{
[ivc.extensionContext openURL:ul completionHandler:^(BOOL ok) {
if (ok) return; // Universal Link 成功
// 统一使用主 App 注册的自定义 Scheme
NSURL *scheme = [NSURL URLWithString:[NSString stringWithFormat:@"%@@//login?src=functionView&index=%ld&title=%@", KB_APP_SCHEME, (long)indexPath.item, encodedTitle]];
[ivc.extensionContext openURL:scheme completionHandler:^(BOOL ok2) {
if (ok2) return;
// 兜底：在用户点击触发的场景下，尝试通过响应链调用 openURL:
// 以提升在“备忘录”等宿主中的成功率。
BOOL bridged = NO;
@try {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability"
bridged = [KBURLOpenBridge openURLViaResponder:scheme from:self];
#pragma clang diagnostic pop
} @catch (__unused NSException *e) { bridged = NO; }
if (!bridged) {
// 两条路都失败：大概率未开完全访问或宿主拦截。统一交由 Manager 引导。
dispatch_async(dispatch_get_main_queue(), ^{ [[KBFullAccessManager shared] ensureFullAccessOrGuideInView:self]; });
}
}];
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) {
// 两条路都失败：大概率未开完全访问或宿主拦截。统一交由 Manager 引导。
dispatch_async(dispatch_get_main_queue(), ^{
[[KBFullAccessManager shared] ensureFullAccessOrGuideInView:self];
});
}
}];
});
}