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

2

Browse Source
This commit is contained in:
CodeST
2025-11-08 20:04:50 +08:00
parent faeb930fe3
commit 3b0beb52da
8 changed files with 620 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

184
keyBoard/Class/Search/VC/KBSearchVC.m
View File

@@ -10,10 +10,16 @@
#import "KBSearchSectionHeader.h"
#import "KBTagCell.h"
#import "KBSkinCardCell.h"
#import "KBHistoryMoreCell.h"
#import "KBSearchResultVC.h"
#import "UICollectionViewLeftAlignedLayout.h"
static NSString * const kTagCellId = @"KBTagCell";
static NSString * const kTagCellId = @"KBTagCell";
static NSString * const kSkinCellId = @"KBSkinCardCell";
static NSString * const kHeaderId = @"KBSearchSectionHeader";
static NSString * const kHeaderId = @"KBSearchSectionHeader";
static NSString * const kMoreCellId = @"KBHistoryMoreCell";
static NSString * const kMoreToken = @"__KB_MORE__"; // 用于内部计算的占位标识
typedef NS_ENUM(NSInteger, KBSearchSection) {
KBSearchSectionHistory = 0,
@@ -26,11 +32,13 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
@property (nonatomic, strong) UIView *titleContainer; // 承载 searchBarView 的容器
// 列表
@property (nonatomic, strong) UICollectionView *collectionView;
@property (nonatomic, strong) UICollectionViewFlowLayout *flowLayout;
@property (nonatomic, strong) UICollectionViewLeftAlignedLayout *flowLayout;
// 数据
@property (nonatomic, strong) NSMutableArray<NSString *> *historyWords; // 历史搜索
@property (nonatomic, strong) NSArray<NSDictionary *> *recommendItems; // 推荐数据（title/price）
@property (nonatomic, assign) BOOL historyExpanded; // 是否展开所有历史
@property (nonatomic, assign) CGFloat lastCollectionWidth; // 记录宽度变化，用于重新计算
@end
@implementation KBSearchVC
@@ -65,18 +73,137 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
[self.collectionView reloadData];
}
- (void)viewDidLayoutSubviews {
[super viewDidLayoutSubviews];
CGFloat w = self.collectionView.bounds.size.width;
if (w > 0 && fabs(w - self.lastCollectionWidth) > 0.5) {
self.lastCollectionWidth = w;
[self.collectionView reloadData];
}
}
#pragma mark - Private
/// 执行搜索：简单将关键字加入历史
/// 执行搜索：将关键字置顶到历史（去重、忽略大小写/前后空格）
- (void)performSearch:(NSString *)kw {
NSString *trim = [kw stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
if (trim.length == 0) { return; }
// 去重插入到最前
[self.historyWords removeObject:trim];
// 忽略大小写去重（把所有等同项移除）
for (NSInteger i = (NSInteger)self.historyWords.count - 1; i >= 0; i--) {
NSString *old = self.historyWords[i];
if ([old caseInsensitiveCompare:trim] == NSOrderedSame) {
[self.historyWords removeObjectAtIndex:i];
}
}
// 插入最前
[self.historyWords insertObject:trim atIndex:0];
[self.collectionView reloadData];
}
/// 打开搜索结果页，把关键字传过去
- (void)openResultForKeyword:(NSString *)kw {
NSString *trim = [kw stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
if (trim.length == 0) { return; }
KBSearchResultVC *vc = [[KBSearchResultVC alloc] init];
vc.defaultKeyword = trim;
[self.navigationController pushViewController:vc animated:YES];
}
/// 计算“最多两行展示”的历史数据，若超出则在第二行尾部添加一个“更多”按钮（向下箭头）。
- (NSArray<NSString *> *)currentDisplayHistory {
if (self.historyExpanded) { return self.historyWords; }
if (self.collectionView.bounds.size.width <= 0) { return self.historyWords; }
CGFloat width = self.collectionView.bounds.size.width;
UIEdgeInsets inset = UIEdgeInsetsMake(8, 16, 12, 16);
CGFloat available = width - inset.left - inset.right;
CGFloat itemSpacing = 8.0; // 与代理中保持一致
NSMutableArray<NSString *> *display = [NSMutableArray array];
NSInteger line = 1;
CGFloat lineUsed = 0.0; // 当前行已占宽度
// 记录当前第2行每个 item 的宽度与在 display 中的下标，便于回退
NSMutableArray<NSNumber *> *lineWidths = [NSMutableArray array];
NSMutableArray<NSNumber *> *lineIndexes = [NSMutableArray array];
for (NSInteger i = 0; i < self.historyWords.count; i++) {
NSString *text = self.historyWords[i];
CGSize sz = [KBTagCell sizeForText:text];
CGFloat w = sz.width;
CGFloat need = (lineUsed == 0 ? w : (lineUsed + itemSpacing + w));
if (need <= available) {
// 放得下，加入当前行
[display addObject:text];
if (line == 2) {
[lineWidths addObject:@(w)];
[lineIndexes addObject:@(display.count - 1)];
}
lineUsed = need;
continue;
}
// 放不下，需要换行或截断
if (line == 1) {
// 换到第 2 行
line = 2;
lineUsed = 0.0;
[lineWidths removeAllObjects];
[lineIndexes removeAllObjects];
// 直接把该元素作为第 2 行的第一个
if (w <= available) {
[display addObject:text];
[lineWidths addObject:@(w)];
[lineIndexes addObject:@(display.count - 1)];
lineUsed = w;
continue;
} else {
// 极端情况：单个标签就超过一行可用宽，直接用“更多”按钮占位
[display addObject:kMoreToken];
return display;
}
}
// 已在第 2 行且再次超出，说明超过两行。需要在第二行末尾放“更多”按钮。
CGSize moreSize = [KBHistoryMoreCell fixedSize];
CGFloat moreNeed = (lineUsed == 0 ? moreSize.width : (lineUsed + itemSpacing + moreSize.width));
if (moreNeed <= available) {
[display addObject:kMoreToken];
return display;
}
// 放不下“更多”，从当前行尾部回退一个标签，直到能放下“更多”。
while (lineIndexes.count > 0) {
NSNumber *lastIndexNum = lineIndexes.lastObject; // display 中的下标
NSNumber *lastWidthNum = lineWidths.lastObject;
[display removeObjectAtIndex:lastIndexNum.integerValue];
[lineIndexes removeLastObject];
[lineWidths removeLastObject];
// 重新计算当前行已占宽
lineUsed = 0.0;
for (NSInteger k = 0; k < lineWidths.count; k++) {
CGFloat iw = lineWidths[k].doubleValue;
lineUsed = (k == 0 ? iw : (lineUsed + itemSpacing + iw));
}
// 加入更多后是否能放得下
moreNeed = (lineUsed == 0 ? moreSize.width : (lineUsed + itemSpacing + moreSize.width));
if (moreNeed <= available) {
[display addObject:kMoreToken];
return display;
}
}
// 如果全部移除仍放不下，则第二行只显示“更多”
[display addObject:kMoreToken];
return display;
}
// 循环结束：数据未超过两行，无需“更多”
return display;
}
/// 清空历史
- (void)clearHistory {
[self.historyWords removeAllObjects];
@@ -91,16 +218,24 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
if (section == KBSearchSectionHistory) {
return self.historyWords.count; // 无历史则为 0
NSArray *list = [self currentDisplayHistory];
return list.count; // 历史最多两行；可能包含“更多”占位
}
return self.recommendItems.count;
}
- (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
if (indexPath.section == KBSearchSectionHistory) {
KBTagCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kTagCellId forIndexPath:indexPath];
[cell config:self.historyWords[indexPath.item]];
return cell;
NSArray *list = [self currentDisplayHistory];
NSString *text = list[indexPath.item];
if ([text isEqualToString:kMoreToken]) {
KBHistoryMoreCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kMoreCellId forIndexPath:indexPath];
return cell;
} else {
KBTagCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kTagCellId forIndexPath:indexPath];
[cell config:text];
return cell;
}
}
KBSkinCardCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kSkinCellId forIndexPath:indexPath];
NSDictionary *it = self.recommendItems[indexPath.item];
@@ -129,7 +264,11 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
- (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
CGFloat width = collectionView.bounds.size.width;
if (indexPath.section == KBSearchSectionHistory) {
NSString *t = self.historyWords[indexPath.item];
NSArray *list = [self currentDisplayHistory];
NSString *t = list[indexPath.item];
if ([t isEqualToString:kMoreToken]) {
return [KBHistoryMoreCell fixedSize];
}
return [KBTagCell sizeForText:t];
}
// 两列卡片
@@ -168,9 +307,17 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
if (indexPath.section == KBSearchSectionHistory) {
NSString *kw = self.historyWords[indexPath.item];
[self.searchBarView updateKeyword:kw];
[self performSearch:kw];
NSArray *list = [self currentDisplayHistory];
NSString *kw = list[indexPath.item];
if ([kw isEqualToString:kMoreToken]) {
// 展开所有历史
self.historyExpanded = YES;
[self.collectionView reloadData];
} else {
[self.searchBarView updateKeyword:kw];
[self performSearch:kw];
[self openResultForKeyword:kw];
}
}
}
@@ -182,7 +329,9 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
_searchBarView.placeholder = @"Themes";
__weak typeof(self) weakSelf = self;
_searchBarView.onSearch = ^(NSString * _Nonnull keyword) {
// 置顶到历史 + 打开结果页
[weakSelf performSearch:keyword];
[weakSelf openResultForKeyword:keyword];
};
}
return _searchBarView;
@@ -191,7 +340,7 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
- (UIView *)titleContainer {
if (!_titleContainer) {
// 固定尺寸：宽 315，高 36（与返回按钮同一 Y 轴，作为 titleView 显示）
CGFloat width = KBFit(315.0);
CGFloat width = 315.0;
_titleContainer = [[UIView alloc] initWithFrame:CGRectMake(0, 0, width, 36.0)];
_titleContainer.backgroundColor = [UIColor clearColor];
// 告诉导航栏使用 AutoLayout 计算尺寸，并强约束宽高为 315x36
@@ -212,9 +361,9 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
return _titleContainer;
}
- (UICollectionViewFlowLayout *)flowLayout {
- (UICollectionViewLeftAlignedLayout *)flowLayout {
if (!_flowLayout) {
_flowLayout = [[UICollectionViewFlowLayout alloc] init];
_flowLayout = [[UICollectionViewLeftAlignedLayout alloc] init];
_flowLayout.scrollDirection = UICollectionViewScrollDirectionVertical;
_flowLayout.sectionHeadersPinToVisibleBounds = NO;
}
@@ -230,6 +379,7 @@ typedef NS_ENUM(NSInteger, KBSearchSection) {
// 注册 cell & header
[_collectionView registerClass:KBTagCell.class forCellWithReuseIdentifier:kTagCellId];
[_collectionView registerClass:KBSkinCardCell.class forCellWithReuseIdentifier:kSkinCellId];
[_collectionView registerClass:KBHistoryMoreCell.class forCellWithReuseIdentifier:kMoreCellId];
[_collectionView registerClass:KBSearchSectionHeader.class forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:kHeaderId];
}
return _collectionView;