From dc813fcabc9215483a09f4d6488a60f19f0ad2e5 Mon Sep 17 00:00:00 2001 From: CodeST <694468528@qq.com> Date: Mon, 17 Nov 2025 15:06:05 +0800 Subject: [PATCH] 2 --- keyBoard/Class/Me/VC/KBSkinDetailVC.m | 4 ++-- keyBoard/Class/Search/V/KBSearchBarView.h | 4 +++- keyBoard/Class/Search/V/KBSearchBarView.m | 11 ++++++++++- keyBoard/Class/Search/VC/KBSearchResultVC.m | 9 +++++---- keyBoard/Class/Search/VC/KBSearchVC.m | 1 + 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/keyBoard/Class/Me/VC/KBSkinDetailVC.m b/keyBoard/Class/Me/VC/KBSkinDetailVC.m index 7bf7f8a..6c0e39e 100644 --- a/keyBoard/Class/Me/VC/KBSkinDetailVC.m +++ b/keyBoard/Class/Me/VC/KBSkinDetailVC.m @@ -136,8 +136,8 @@ typedef NS_ENUM(NSInteger, KBSkinDetailSection) { // 2 列 CGFloat spacing = 12.0; CGFloat itemW = floor((contentW - spacing) / 2.0); - CGFloat itemH = itemW * 0.75 + 56; // 参考 KBSkinCardCell 内部布局 - return CGSizeMake(itemW, itemH); +// CGFloat itemH = itemW * 0.75 + 56; + return CGSizeMake(itemW, KBFit(197)); } } return CGSizeZero; diff --git a/keyBoard/Class/Search/V/KBSearchBarView.h b/keyBoard/Class/Search/V/KBSearchBarView.h index da1750e..f0710c1 100644 --- a/keyBoard/Class/Search/V/KBSearchBarView.h +++ b/keyBoard/Class/Search/V/KBSearchBarView.h @@ -16,6 +16,9 @@ NS_ASSUME_NONNULL_BEGIN /// 输入框 @property (nonatomic, strong, readonly) UITextField *textField; +/// 背景视图圆角(默认 20),外部可自定义。 +@property (nonatomic, assign) CGFloat bgCornerRadius; + /// 点击键盘 return 或右侧按钮时回调 @property (nonatomic, copy) void(^onSearch)(NSString *keyword); @@ -28,4 +31,3 @@ NS_ASSUME_NONNULL_BEGIN @end NS_ASSUME_NONNULL_END - diff --git a/keyBoard/Class/Search/V/KBSearchBarView.m b/keyBoard/Class/Search/V/KBSearchBarView.m index 92256c0..e762875 100644 --- a/keyBoard/Class/Search/V/KBSearchBarView.m +++ b/keyBoard/Class/Search/V/KBSearchBarView.m @@ -75,7 +75,8 @@ _bgView = [[UIView alloc] init]; // 淡灰色背景 + 圆角 _bgView.backgroundColor = [UIColor colorWithWhite:0.95 alpha:1.0]; - _bgView.layer.cornerRadius = 20; + CGFloat radius = self.bgCornerRadius > 0 ? self.bgCornerRadius : 20.0; + _bgView.layer.cornerRadius = radius; _bgView.layer.masksToBounds = YES; } return _bgView; @@ -122,4 +123,12 @@ self.textField.placeholder = placeholder; } +- (void)setBgCornerRadius:(CGFloat)bgCornerRadius { + _bgCornerRadius = bgCornerRadius; + // 如果 bgView 已创建,立即更新圆角 + if (_bgView) { + _bgView.layer.cornerRadius = bgCornerRadius; + } +} + @end diff --git a/keyBoard/Class/Search/VC/KBSearchResultVC.m b/keyBoard/Class/Search/VC/KBSearchResultVC.m index d8278c2..c63c07b 100644 --- a/keyBoard/Class/Search/VC/KBSearchResultVC.m +++ b/keyBoard/Class/Search/VC/KBSearchResultVC.m @@ -52,9 +52,10 @@ static NSString * const kResultCellId = @"KBSkinCardCell"; [self.searchBarView mas_makeConstraints:^(MASConstraintMaker *make) { make.centerY.equalTo(self.backButton); make.left.equalTo(self.backButton.mas_right).offset(12); - make.width.mas_equalTo(315); +// make.width.mas_equalTo(315); make.height.mas_equalTo(36); - make.right.lessThanOrEqualTo(self.topBar).offset(-16); +// make.right.lessThanOrEqualTo(self.topBar).offset(-16); + make.right.equalTo(self.view).offset(-16); }]; [self.collectionView mas_makeConstraints:^(MASConstraintMaker *make) { make.top.equalTo(self.topBar.mas_bottom).offset(12); @@ -119,8 +120,8 @@ static NSString * const kResultCellId = @"KBSkinCardCell"; CGFloat inset = 16; // 左右间距 CGFloat spacing = 12; // 列间距 CGFloat w = floor((width - inset * 2 - spacing) / 2.0); - CGFloat h = w * 0.75 + 8 + 20 + 10 + 6 + 8; // 与 KBSkinCardCell 估算一致 - return CGSizeMake(w, h); +// CGFloat h = w * 0.75 + 8 + 20 + 10 + 6 + 8; // 与 KBSkinCardCell 估算一致 + return CGSizeMake(w, KBFit(197)); } - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout insetForSectionAtIndex:(NSInteger)section { diff --git a/keyBoard/Class/Search/VC/KBSearchVC.m b/keyBoard/Class/Search/VC/KBSearchVC.m index 57ea0c9..412c3f3 100644 --- a/keyBoard/Class/Search/VC/KBSearchVC.m +++ b/keyBoard/Class/Search/VC/KBSearchVC.m @@ -352,6 +352,7 @@ typedef NS_ENUM(NSInteger, KBSearchSection) { - (KBSearchBarView *)searchBarView { if (!_searchBarView) { _searchBarView = [[KBSearchBarView alloc] init]; + _searchBarView.bgCornerRadius = 18; _searchBarView.placeholder = @"Themes"; KBWeakSelf _searchBarView.onSearch = ^(NSString * _Nonnull keyword) {