From 3144315de571b832ddb4ddcf1dc839c2902233ee Mon Sep 17 00:00:00 2001 From: CodeST <694468528@qq.com> Date: Thu, 27 Nov 2025 20:05:39 +0800 Subject: [PATCH] 1 --- .../My/mask_top_title.imageset/Contents.json | 21 ++++++++ .../mask_top_title.png | Bin 0 -> 11775 bytes keyBoard/Class/Guard/V/KBKeyboardMaskView.m | 48 ++++++++++++++---- keyBoard/Class/Guard/VC/KBGuideVC.m | 5 +- keyBoard/Class/Pay/V/KBVipReviewListCell.m | 2 - keyBoard/Class/Pay/VC/KBVipPay.m | 2 - keyBoard/Class/Shop/VC/KBShopItemVC.m | 2 - keyBoard/KeyBoardPrefixHeader.pch | 2 - 8 files changed, 59 insertions(+), 23 deletions(-) create mode 100644 keyBoard/Assets.xcassets/My/mask_top_title.imageset/Contents.json create mode 100644 keyBoard/Assets.xcassets/My/mask_top_title.imageset/mask_top_title.png diff --git a/keyBoard/Assets.xcassets/My/mask_top_title.imageset/Contents.json b/keyBoard/Assets.xcassets/My/mask_top_title.imageset/Contents.json new file mode 100644 index 0000000..236b5cb --- /dev/null +++ b/keyBoard/Assets.xcassets/My/mask_top_title.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "mask_top_title.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/keyBoard/Assets.xcassets/My/mask_top_title.imageset/mask_top_title.png b/keyBoard/Assets.xcassets/My/mask_top_title.imageset/mask_top_title.png new file mode 100644 index 0000000000000000000000000000000000000000..25100d4b7623720487c29f899f3ef640fb32fcad GIT binary patch literal 11775 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 labelMaxWidth && labelMaxWidth > 0) { + scale = labelMaxWidth / imgW; + } + CGFloat labelW = imgW * scale; + CGFloat labelH = imgH * scale; + + CGFloat labelX = (CGRectGetWidth(self.bounds) - labelW) * 0.5; + CGFloat labelBottom = CGRectGetMinY(self.gifView.frame) - 20.0; + CGFloat labelY = labelBottom - labelH; + self.tipLabel.frame = CGRectMake(labelX, labelY, labelW, labelH); } - (void)onTapMask:(UITapGestureRecognizer *)gr { diff --git a/keyBoard/Class/Guard/VC/KBGuideVC.m b/keyBoard/Class/Guard/VC/KBGuideVC.m index da458ce..fd21f98 100644 --- a/keyBoard/Class/Guard/VC/KBGuideVC.m +++ b/keyBoard/Class/Guard/VC/KBGuideVC.m @@ -62,11 +62,8 @@ typedef NS_ENUM(NSInteger, KBGuideItemType) { make.left.right.equalTo(self.view); make.height.mas_equalTo(52); // 底部跟随键盘变化 - if (@available(iOS 11.0, *)) { self.inputBarBottom = make.bottom.equalTo(self.view.mas_safeAreaLayoutGuideBottom); - } else { - self.inputBarBottom = make.bottom.equalTo(self.view); - } + }]; [self.textField mas_makeConstraints:^(MASConstraintMaker *make) { diff --git a/keyBoard/Class/Pay/V/KBVipReviewListCell.m b/keyBoard/Class/Pay/V/KBVipReviewListCell.m index 6acedaa..159de50 100644 --- a/keyBoard/Class/Pay/V/KBVipReviewListCell.m +++ b/keyBoard/Class/Pay/V/KBVipReviewListCell.m @@ -71,9 +71,7 @@ static NSString * const kKBVipReviewItemCellId = @"kKBVipReviewItemCellId"; _collectionView.dataSource = self; _collectionView.delegate = self; [_collectionView registerClass:KBVipReviewItemCell.class forCellWithReuseIdentifier:kKBVipReviewItemCellId]; - if (@available(iOS 11.0, *)) { _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } } return _collectionView; } diff --git a/keyBoard/Class/Pay/VC/KBVipPay.m b/keyBoard/Class/Pay/VC/KBVipPay.m index 8a3c2ad..efc4876 100644 --- a/keyBoard/Class/Pay/VC/KBVipPay.m +++ b/keyBoard/Class/Pay/VC/KBVipPay.m @@ -242,9 +242,7 @@ static NSString * const kKBVipReviewListCellId = @"kKBVipReviewListCellId"; _collectionView.dataSource = self; _collectionView.delegate = self; _collectionView.alwaysBounceVertical = YES; - if (@available(iOS 11.0, *)) { _collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } [_collectionView registerClass:KBVipPayHeaderView.class forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:kKBVipHeaderId]; [_collectionView registerClass:KBVipSubscribeCell.class forCellWithReuseIdentifier:kKBVipSubscribeCellId]; [_collectionView registerClass:KBVipReviewListCell.class forCellWithReuseIdentifier:kKBVipReviewListCellId]; diff --git a/keyBoard/Class/Shop/VC/KBShopItemVC.m b/keyBoard/Class/Shop/VC/KBShopItemVC.m index f75435d..b488d37 100644 --- a/keyBoard/Class/Shop/VC/KBShopItemVC.m +++ b/keyBoard/Class/Shop/VC/KBShopItemVC.m @@ -47,9 +47,7 @@ }]; } - if (@available(iOS 11.0, *)) { self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever; - } [self beginFirstRefresh]; } diff --git a/keyBoard/KeyBoardPrefixHeader.pch b/keyBoard/KeyBoardPrefixHeader.pch index 55d3664..0dd7a9a 100644 --- a/keyBoard/KeyBoardPrefixHeader.pch +++ b/keyBoard/KeyBoardPrefixHeader.pch @@ -100,10 +100,8 @@ static inline UIWindow *KB_KeyWindow(void) { // Safe Area static inline UIEdgeInsets KB_SafeAreaInsets(void) { - if (@available(iOS 11.0, *)) { UIWindow *w = KB_KeyWindow(); return w ? w.safeAreaInsets : UIEdgeInsetsZero; - } return UIEdgeInsetsZero; }