1

2025-11-10 15:38:30 +08:00
parent 97316c7989
commit 1cdc17b710
18 changed files with 337 additions and 20 deletions
--- a/keyBoard/Class/Categories/KBHUD.h
+++ b/keyBoard/Class/Categories/KBHUD.h
@@ -1,72 +0,0 @@
-//
-//  KBHUD.h
-//  keyBoard
-//
-//  基于 MBProgressHUD 的轻量封装，提供类似 SVProgressHUD 的类方法调用方式。
-//  特性：
-//  - 默认加到 KeyWindow 上
-//  - 支持遮罩模式（不拦截/透明拦截/半透明黑遮罩）
-//  - 默认不支持点击背景关闭；可为“本次显示/当前 HUD”开启点击关闭
-//  - 文案/加载/进度/自动消失
-//
-
-#import <Foundation/Foundation.h>
-@class UIView; // forward declare to avoid importing UIKit in header
-
-typedef NS_ENUM(NSUInteger, KBHUDMaskType) {
-    /// 不加遮罩，事件可透传到后面的视图（与 SVProgressHUDMaskTypeNone 类似）
-    KBHUDMaskTypeNone = 0,
-    /// 透明遮罩，拦截触摸但不变暗（与 SVProgressHUDMaskTypeClear 类似）
-    KBHUDMaskTypeClear,
-    /// 半透明黑色遮罩（与 SVProgressHUDMaskTypeBlack 类似）
-    KBHUDMaskTypeBlack,
-};
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface KBHUD : NSObject
-
-#pragma mark - 显示
-/// 纯菊花
-+ (void)show;
-/// 菊花 + 文案
-+ (void)showWithStatus:(nullable NSString *)status;
-/// 菊花 + 文案（可配置：是否允许点击背景关闭）
-+ (void)showWithStatus:(nullable NSString *)status allowTapToDismiss:(BOOL)allow;
-/// 圆形进度 0~1 + 文案
-+ (void)showProgress:(float)progress status:(nullable NSString *)status;
-/// 圆形进度 0~1 + 文案（可配置：是否允许点击背景关闭）
-+ (void)showProgress:(float)progress status:(nullable NSString *)status allowTapToDismiss:(BOOL)allow;
-/// 文案提示（自动隐藏）
-+ (void)showInfo:(NSString *)status;
-/// 成功提示（自动隐藏）
-+ (void)showSuccess:(NSString *)status;
-/// 失败提示（自动隐藏）
-+ (void)showError:(NSString *)status;
-
-#pragma mark - 隐藏
-/// 立即隐藏
-+ (void)dismiss;
-/// 延时隐藏
-+ (void)dismissWithDelay:(NSTimeInterval)delay;
-
-#pragma mark - 配置（全局）
-/// 设置默认遮罩类型，默认 KBHUDMaskTypeClear
-+ (void)setDefaultMaskType:(KBHUDMaskType)maskType;
-/// 为“当前正在展示的 HUD”设置点击背景是否关闭；若当前没有 HUD 则忽略
-+ (void)setTapToDismissEnabled:(BOOL)enabled;
-/// 仅本次显示：菊花（无文案）可配置是否允许点击背景关闭
-+ (void)showAllowTapToDismiss:(BOOL)allow;
-/// 设置自动隐藏的时长（success/error/info），默认 1.2s
-+ (void)setAutoDismissInterval:(NSTimeInterval)interval;
-
-/// 设置缺省承载视图（App Extension 环境下必须设置，例如在键盘扩展里传入 self.view）
-/// 注意：内部弱引用，不会形成循环引用。
-/// 若不设置，在非 Extension 的 App 内默认加到 KeyWindow；在 Extension 内将不会显示。
-/// 可在 viewDidLoad 或 viewDidAppear 调用一次即可。
-/// @param view 作为 HUD 的承载父视图
- + (void)setContainerView:(nullable UIView *)view;
-
-@end
-
-NS_ASSUME_NONNULL_END
--- a/keyBoard/Class/Categories/KBHUD.m
+++ b/keyBoard/Class/Categories/KBHUD.m
@@ -1,200 +0,0 @@
-//
-//  KBHUD.m
-//  keyBoard
-//
-
-#import "KBHUD.h"
-#import <MBProgressHUD/MBProgressHUD.h>
-#import <UIKit/UIKit.h>
-
-#ifndef KBSCREEN
-#define KBSCREEN [UIScreen mainScreen].bounds.size
-#endif
-
-@implementation KBHUD
-
-static __weak MBProgressHUD *sHUD = nil;
-static KBHUDMaskType sMaskType = KBHUDMaskTypeClear;   // 全局默认遮罩
-static BOOL sDefaultTapToDismiss = NO;                  // 全局默认：不允许点击关闭
-static NSTimeInterval sAutoDismiss = 1.2;
-static __weak UIView *sContainerView = nil;             // 缺省承载视图（扩展里必须设置）
-
-#pragma mark - Private Helpers
-
-+ (void)onMain:(dispatch_block_t)blk {
-    if (NSThread.isMainThread) { blk(); } else { dispatch_async(dispatch_get_main_queue(), blk); }
-}
-
-+ (MBProgressHUD *)ensureHUDWithMask:(KBHUDMaskType)mask tap:(BOOL)tap {
-    // 先尝试使用外部指定的容器视图（扩展环境推荐）
-    UIView *hostView = sContainerView;
-#ifndef KB_APP_EXTENSION
-    // App 内退回到 KeyWindow
-    if (!hostView) {
-        // KB_KeyWindow 在 App 目标的 PrefixHeader 中定义；在扩展内不依赖它
-        UIWindow *win = nil;
-        // 避免强依赖某个前缀：这里以运行时方式访问 UIApplication 以规避编译期的 App Extension 限制
-        Class uiAppClass = NSClassFromString(@"UIApplication");
-        if (uiAppClass && [uiAppClass respondsToSelector:@selector(sharedApplication)]) {
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
-            id app = [uiAppClass performSelector:@selector(sharedApplication)];
-            if ([app respondsToSelector:@selector(keyWindow)]) {
-                win = [app keyWindow];
-            }
-            if (!win && [app respondsToSelector:@selector(windows)]) {
-                NSArray *wins = [app windows];
-                win = wins.firstObject;
-            }
-#pragma clang diagnostic pop
-        }
-        hostView = win;
-    }
-#endif
-
-    if (!hostView) { return nil; }
-
-    MBProgressHUD *hud = sHUD;
-    if (!hud) {
-        hud = [MBProgressHUD showHUDAddedTo:hostView animated:YES];
-        sHUD = hud;
-        // 外观：深色圆角，白色文字，模仿 SVProgressHUD 默认
-        hud.removeFromSuperViewOnHide = YES;
-        hud.bezelView.style = MBProgressHUDBackgroundStyleSolidColor;
-        hud.bezelView.layer.cornerRadius = 12.0;
-        hud.bezelView.color = [UIColor colorWithWhite:0 alpha:0.8];
-        hud.contentColor = UIColor.whiteColor;
-        hud.margin = 16;
-        hud.label.numberOfLines = 0;
-        hud.detailsLabel.numberOfLines = 0;
-    }
-    // 遮罩与交互（按本次 show 的入参应用）
-    [self applyMaskType:mask hud:hud];
-    [self applyTapToDismiss:tap hud:hud];
-    return hud;
-}
-
-+ (void)applyMaskType:(KBHUDMaskType)type hud:(MBProgressHUD *)hud {
-    switch (type) {
-        case KBHUDMaskTypeNone: {
-            hud.userInteractionEnabled = NO;                 // 不拦截触摸
-            hud.backgroundView.style = MBProgressHUDBackgroundStyleSolidColor;
-            hud.backgroundView.color = UIColor.clearColor;
-        } break;
-        case KBHUDMaskTypeClear: {
-            hud.userInteractionEnabled = YES;                // 拦截触摸但不变暗
-            hud.backgroundView.style = MBProgressHUDBackgroundStyleSolidColor;
-            hud.backgroundView.color = [UIColor colorWithWhite:0 alpha:0.01];
-        } break;
-        case KBHUDMaskTypeBlack: {
-            hud.userInteractionEnabled = YES;                // 变暗并拦截
-            hud.backgroundView.style = MBProgressHUDBackgroundStyleSolidColor;
-            hud.backgroundView.color = [UIColor colorWithWhite:0 alpha:0.35];
-        } break;
-    }
-}
-
-+ (void)applyTapToDismiss:(BOOL)enabled hud:(MBProgressHUD *)hud {
-    UIView *bg = hud.backgroundView;
-    // 清理旧手势
-    for (UIGestureRecognizer *g in bg.gestureRecognizers.copy) {
-        if ([g isKindOfClass:UITapGestureRecognizer.class] && g.view == bg) {
-            [bg removeGestureRecognizer:g];
-        }
-    }
-    if (enabled) {
-        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_kb_handleTap)];
-        [bg addGestureRecognizer:tap];
-        // 确保可拦截
-        hud.userInteractionEnabled = YES;
-        if (hud.backgroundView.color == UIColor.clearColor) {
-            hud.backgroundView.color = [UIColor colorWithWhite:0 alpha:0.01];
-        }
-    }
-}
-
-+ (void)_kb_handleTap {
-    [self dismiss];
-}
-
-+ (void)_showText:(NSString *)text icon:(nullable UIImage *)icon {
-    [self onMain:^{
-        MBProgressHUD *hud = [self ensureHUDWithMask:sMaskType tap:sDefaultTapToDismiss];
-        if (!hud) { return; }
-        hud.mode = icon ? MBProgressHUDModeCustomView : MBProgressHUDModeText;
-        hud.label.text = text ?: @"";
-        hud.detailsLabel.text = nil;
-        if (icon) {
-            UIImageView *iv = [[UIImageView alloc] initWithImage:icon];
-            hud.customView = iv;
-        } else {
-            hud.customView = nil;
-        }
-        [hud hideAnimated:YES afterDelay:sAutoDismiss];
-    }];
-}
-
-#pragma mark - Public API
-
-+ (void)show { [self showWithStatus:nil]; }
-
-+ (void)showWithStatus:(NSString *)status { [self showWithStatus:status allowTapToDismiss:NO]; }
-
-+ (void)showWithStatus:(NSString *)status allowTapToDismiss:(BOOL)allow {
-    [self onMain:^{
-        MBProgressHUD *hud = [self ensureHUDWithMask:sMaskType tap:allow];
-        if (!hud) { return; }
-        hud.mode = MBProgressHUDModeIndeterminate;
-        hud.label.text = status ?: @"";
-    }];
-}
-
-+ (void)showProgress:(float)progress status:(NSString *)status {
-    [self showProgress:progress status:status allowTapToDismiss:NO];
-}
-
-+ (void)showProgress:(float)progress status:(NSString *)status allowTapToDismiss:(BOOL)allow {
-    [self onMain:^{
-        MBProgressHUD *hud = [self ensureHUDWithMask:sMaskType tap:allow];
-        if (!hud) { return; }
-        hud.mode = MBProgressHUDModeDeterminate;
-        hud.progress = progress;
-        hud.label.text = status ?: @"";
-    }];
-}
-
-+ (void)showInfo:(NSString *)status {
-    [self _showText:status icon:nil];
-}
-
-+ (void)showSuccess:(NSString *)status {
-    // 简单起见，使用文字模式；如需图标，可替换为自定义勾勾图片
-    [self _showText:status ?: @"成功" icon:nil];
-}
-
-+ (void)showError:(NSString *)status { [self _showText:status ?: @"失败" icon:nil]; }
-
-+ (void)dismiss { [self onMain:^{ [sHUD hideAnimated:YES]; }]; }
-
-+ (void)dismissWithDelay:(NSTimeInterval)delay { [self onMain:^{ [sHUD hideAnimated:YES afterDelay:delay]; }]; }
-
-#pragma mark - Config
-
-+ (void)setDefaultMaskType:(KBHUDMaskType)maskType { sMaskType = maskType; }
-+ (void)setTapToDismissEnabled:(BOOL)enabled {
-    // 仅针对当前可见 HUD 生效，不修改默认值，满足“B 允许点击，A 默认不允许”的诉求
-    [self onMain:^{
-        if (sHUD) { [self applyTapToDismiss:enabled hud:sHUD]; }
-    }];
-}
-+ (void)setAutoDismissInterval:(NSTimeInterval)interval { sAutoDismiss = MAX(0.2, interval); }
-
-+ (void)showAllowTapToDismiss:(BOOL)allow {
-    [self showWithStatus:nil allowTapToDismiss:allow];
-}
-
-+ (void)setContainerView:(UIView *)view {
-    sContainerView = view;
-}
-
-@end
--- a/keyBoard/Class/Categories/UIViewController+Extension.m
+++ b/keyBoard/Class/Categories/UIViewController+Extension.m
@@ -34,13 +34,25 @@ static inline __kindof UIWindow *KBActiveWindow(void) {

 + (UIViewController *)kb_topMostViewController {
    UIWindow *window = KBActiveWindow();
-    UIViewController *root = window.rootViewController;
-    if (!root) return nil;
-    UIViewController *top = root;
-    while (top.presentedViewController) {
-        top = top.presentedViewController;
+    UIViewController *vc = window.rootViewController;
+    if (!vc) return nil;
+    // 展开容器控制器
+    while (1) {
+        if ([vc isKindOfClass:UINavigationController.class]) {
+            vc = ((UINavigationController *)vc).visibleViewController ?: vc;
+            continue;
+        }
+        if ([vc isKindOfClass:UITabBarController.class]) {
+            vc = ((UITabBarController *)vc).selectedViewController ?: vc;
+            continue;
+        }
+        if (vc.presentedViewController) {
+            vc = vc.presentedViewController;
+            continue;
+        }
+        break;
    }
-    return top;
+    return vc;
 }

@end