1

keyBoard/Class/Base/VC/BaseTabBarController.m

@@ -37,7 +37,6 @@
 
     // 商城
     KBShopVC *shop = [[KBShopVC alloc] init];
-    shop.title = @"商城";
     BaseNavigationController *navShop = [[BaseNavigationController alloc] initWithRootViewController:shop];
     navShop.tabBarItem = [self tabItemWithTitle:@"商城"
                                         image:@"tab_shop"

keyBoard/Class/Manager/AppleSignInManager.m

@@ -26,6 +26,11 @@ static NSString * const kKBAppleUserIdentifierKey = @"com.company.keyboard.apple
 }
 
 - (void)signInFromViewController:(UIViewController *)presenting completion:(KBAppleSignInCompletion)completion {
+    if (!NSThread.isMainThread) {
+        // 确保在主线程发起，否则可能得到 Unknown(1000)
+        dispatch_async(dispatch_get_main_queue(), ^{ [self signInFromViewController:presenting completion:completion]; });
+        return;
+    }
     if (@available(iOS 13.0, *)) {
         self.presentingVC = presenting;
         self.completion = completion;
@@ -110,7 +115,21 @@ static NSString * const kKBAppleUserIdentifierKey = @"com.company.keyboard.apple
 #pragma mark - 授权界面展示锚点 (ASAuthorizationControllerPresentationContextProviding)
 
 - (ASPresentationAnchor)presentationAnchorForAuthorizationController:(ASAuthorizationController *)controller API_AVAILABLE(ios(13.0)) {
-    return self.presentingVC.view.window ?: UIApplication.sharedApplication.keyWindow;
+    // 优先用传入 VC 的 window
+    UIWindow *win = self.presentingVC.view.window;
+    if (win) return win;
+    // iOS13+ 从前台激活的 scene 中取 keyWindow
+    for (UIScene *scene in UIApplication.sharedApplication.connectedScenes) {
+        if (scene.activationState == UISceneActivationStateForegroundActive && [scene isKindOfClass:[UIWindowScene class]]) {
+            UIWindowScene *ws = (UIWindowScene *)scene;
+            for (UIWindow *w in ws.windows) { if (w.isKeyWindow) return w; }
+            if (ws.windows.firstObject) return ws.windows.firstObject;
+        }
+    }
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+    return UIApplication.sharedApplication.keyWindow ?: UIApplication.sharedApplication.windows.firstObject;
+#pragma clang diagnostic pop
 }
 
 #pragma mark - Keychain 工具

keyBoard/Class/Shop/V/KBShopHeadView.m

@@ -9,12 +9,11 @@
 
 @implementation KBShopHeadView
 
-/*
-// Only override drawRect: if you perform custom drawing.
-// An empty implementation adversely affects performance during animation.
-- (void)drawRect:(CGRect)rect {
-    // Drawing code
+- (instancetype)initWithFrame:(CGRect)frame{
+    if (self = [super initWithFrame:frame]) {
+        self.backgroundColor = [UIColor clearColor];
+    }
+    return self;
 }
-*/
 
 @end

keyBoard/Class/Shop/VC/KBShopVC.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface KBShopVC : UIViewController
+@interface KBShopVC : BaseViewController
 
 @end
 

keyBoard/Class/Shop/VC/KBShopVC.m

@@ -30,13 +30,21 @@ static const CGFloat JXheightForHeaderInSection = 50;
 
 @property (nonatomic, strong) JXCategoryTitleView *categoryView;
 @property (nonatomic, strong) NSArray <NSString *> *titles;
+@property (nonatomic, strong) UIImageView *bgImageView;  // 全屏背景图
+
 @end
 
 @implementation KBShopVC
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-//    [self setupUI];
+    self.bgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"my_bg_icon"]];
+    self.bgImageView.contentMode = UIViewContentModeScaleAspectFill;
+    [self.view addSubview:self.bgImageView];
+    [self.bgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.equalTo(self.view);
+    }];
+    [self setupUI];
 
 }
 
@@ -90,6 +98,7 @@ static const CGFloat JXheightForHeaderInSection = 50;
 
     _pagerView = [self preferredPagingView];
     self.pagerView.mainTableView.gestureDelegate = self;
+    self.pagerView.mainTableView.backgroundColor = [UIColor clearColor];
     [self.view addSubview:self.pagerView];
 //    self.pagerView.listContainerView.scrollView.scrollEnabled = false;
 
@@ -119,7 +128,7 @@ static const CGFloat JXheightForHeaderInSection = 50;
     self.naviBGView.frame = CGRectMake(0, 0, KB_SCREEN_WIDTH, KB_NAV_TOTAL_HEIGHT);
     [self.view addSubview:self.naviBGView];
     UILabel *naviTitleLabel = [[UILabel alloc] init];
-    naviTitleLabel.text = @"导航栏隐藏";
+    naviTitleLabel.text = @"商城";
     naviTitleLabel.textAlignment = NSTextAlignmentCenter;
     naviTitleLabel.frame = CGRectMake(0, KB_STATUSBAR_HEIGHT, self.view.bounds.size.width, 44);
     [self.naviBGView addSubview:naviTitleLabel];