修复 UICollectionView 托管类的问题

zhanghang · zhanghang · commit c1f6291df728 · 2018-03-27T16:29:51.000+08:00
diff --git a/ZHTableViewGroup/Classes/ZHAutoConfigurationCollectionViewDelegate.m b/ZHTableViewGroup/Classes/ZHAutoConfigurationCollectionViewDelegate.m
@@ -20,16 +20,6 @@ - (instancetype)initWithDataSource:(ZHCollectionViewDataSource *)dataSource {
     return self;
 }
 
-- (ZHCollectionViewDataSourceCustomHeightCompletionHandle)completionHandleWithCollectionView:(UICollectionView *)collectionView heightAtIndexPath:(NSIndexPath *)indexPath {
-    ZHCollectionViewDataSourceCustomHeightCompletionHandle completionHandle = ^CGFloat(ZHCollectionViewBaseModel *model) {
-        if (!model.customHeightCompletionHandle) {
-            return model.height;
-        }
-        return model.customHeightCompletionHandle(collectionView,[ZHCollectionViewDataSource indexPathWithDataSource:_dataSource indexPath:indexPath],model);
-    };
-    return completionHandle;
-}
-
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
     return [ZHCollectionViewDataSource numberOfSectionsWithDataSource:_dataSource];
 }
@@ -56,15 +46,15 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
-    return CGSizeZero;
+    return [ZHCollectionViewDataSource sizeForItemWithDataSource:_dataSource indexPath:indexPath];
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section {
-    return CGSizeZero;
+    return [ZHCollectionViewDataSource referenceSizeForHeaderFooterWithDataSource:_dataSource style:ZHCollectionViewHeaderFooterStyleHeader section:section];
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout *)collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section {
-    return CGSizeZero;
+    return [ZHCollectionViewDataSource referenceSizeForHeaderFooterWithDataSource:_dataSource style:ZHCollectionViewHeaderFooterStyleFooter section:section];
 }
 
 @end
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewBaseModel.h b/ZHTableViewGroup/Classes/ZHCollectionViewBaseModel.h
@@ -25,8 +25,17 @@ typedef CGFloat (^ZHCollectionViewBaseModelCustomHeightCompletionHandle)(UIColle
 @property (nonatomic, strong) Class anyClass;
 /**
  高度 默认为 NSNotFound
+ height 属性废弃 用size
  */
-@property (nonatomic, assign) CGFloat height;
+//@property (nonatomic, assign) CGFloat height;
+
+
+/**
+ * 设置 UICollectionCell UICollectionReusableView 的大小
+ * 默认 CGSizeZero
+ */
+@property (nonatomic, assign) CGSize size;
+
 /**
  * 自定义高度
  */
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewBaseModel.m b/ZHTableViewGroup/Classes/ZHCollectionViewBaseModel.m
@@ -12,7 +12,7 @@ @implementation ZHCollectionViewBaseModel
 
 - (instancetype)init {
     if (self = [super init]) {
-        _height = NSNotFound;
+        _size = CGSizeZero;
     }
     return self;
 }
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewCell.h b/ZHTableViewGroup/Classes/ZHCollectionViewCell.h
@@ -72,7 +72,7 @@
 - (void)configurationCellWithCellNumber:(NSUInteger)cellNumber
                              identifier:(NSString *)identifier
                                anyClass:(Class)anyClass
-                                 height:(CGFloat)height
+                                 size:(CGSize)size
                  configCompletionHandle:(void(^)(CellType cell, NSIndexPath *indexPath))configCompletionHandle
            didSelectRowCompletionHandle:(void(^)(CellType cell, NSIndexPath *indexPath))didSelectRowCompletionHandle;
 
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewCell.m b/ZHTableViewGroup/Classes/ZHCollectionViewCell.m
@@ -45,13 +45,13 @@ - (void)configCellWithCell:(UICollectionViewCell *)cell
 - (void)configurationCellWithCellNumber:(NSUInteger)cellNumber
                              identifier:(NSString *)identifier
                                anyClass:(Class)anyClass
-                                 height:(CGFloat)height
+                                 size:(CGSize)size
                  configCompletionHandle:(void (^)(UICollectionViewCell *, NSIndexPath *))configCompletionHandle
            didSelectRowCompletionHandle:(void (^)(UICollectionViewCell *, NSIndexPath *))didSelectRowCompletionHandle {
     self.cellNumber = cellNumber;
     self.identifier = identifier;
     self.anyClass = anyClass;
-    self.height = height;
+    self.size = size;
     self.configCompletionHandle = configCompletionHandle;
     self.didSelectRowCompletionHandle = didSelectRowCompletionHandle;
 }
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewDataSource.h b/ZHTableViewGroup/Classes/ZHCollectionViewDataSource.h
@@ -146,5 +146,9 @@ typedef CGFloat (^ZHCollectionViewDataSourceCustomHeightCompletionHandle)(ZHColl
 
 + (NSIndexPath *)indexPathWithDataSource:(ZHCollectionViewDataSource *)dataSource indexPath:(NSIndexPath *)indexPath;
 
++ (CGSize)sizeForItemWithDataSource:(ZHCollectionViewDataSource *)dataSource indexPath:(NSIndexPath *)indexPath;
+
++ (CGSize)referenceSizeForHeaderFooterWithDataSource:(ZHCollectionViewDataSource *)dataSource style:(ZHCollectionViewHeaderFooterStyle)style section:(NSUInteger)section;
+
 @end
 
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewDataSource.m b/ZHTableViewGroup/Classes/ZHCollectionViewDataSource.m
@@ -12,16 +12,18 @@
 @interface ZHCollectionViewDataSource ()
 
 @property (nonatomic, strong) NSMutableArray<ZHCollectionViewGroup *> *groups;
-@property (nonatomic, strong) UICollectionView *CollectionView;
+@property (nonatomic, strong) UICollectionView *collectionView;
 @property (nonatomic, strong) ZHAutoConfigurationCollectionViewDelegate *autoConfiguration;
 
 @end
 
-@implementation ZHCollectionViewDataSource
+@implementation ZHCollectionViewDataSource {
+	
+}
 
 - (instancetype)initWithCollectionView:(UICollectionView *)CollectionView {
     if (self = [super init]) {
-        _CollectionView = CollectionView;
+        _collectionView = CollectionView;
         self.autoConfigurationCollectionViewDelegate = YES;
     }
     return self;
@@ -30,8 +32,8 @@ - (instancetype)initWithCollectionView:(UICollectionView *)CollectionView {
 - (void)setAutoConfigurationCollectionViewDelegate:(BOOL)autoConfigurationCollectionViewDelegate {
     _autoConfigurationCollectionViewDelegate = autoConfigurationCollectionViewDelegate;
     if (autoConfigurationCollectionViewDelegate) {
-        _CollectionView.dataSource = self.autoConfiguration;
-        _CollectionView.delegate = self.autoConfiguration;
+        _collectionView.dataSource = self.autoConfiguration;
+        _collectionView.delegate = self.autoConfiguration;
     }
 }
 
@@ -45,7 +47,7 @@ - (void)addGroupWithCompletionHandle:(ZHCollectionViewDataSourceAddGroupCompleti
 
 - (void)reloadCollectionViewData {
     [self registerClasss];
-    [self.CollectionView reloadData];
+    [self.collectionView reloadData];
 }
 
 + (NSInteger)numberOfRowsInSectionWithDataSource:(ZHCollectionViewDataSource *)dataSource
@@ -64,7 +66,7 @@ + (UICollectionViewCell *)cellForRowAtWithDataSource:(ZHCollectionViewDataSource
     if (!group) {
         return cell;
     }
-    UICollectionViewCell *resultCell = [group cellForCollectionViewWithCollectionView:dataSource.CollectionView indexPath:indexPath];
+    UICollectionViewCell *resultCell = [group cellForCollectionViewWithCollectionView:dataSource.collectionView indexPath:indexPath];
     if (!resultCell) {
         return cell;
     }
@@ -78,20 +80,6 @@ + (NSInteger)numberOfSectionsWithDataSource:(ZHCollectionViewDataSource *)dataSo
     return dataSource.groups.count;
 }
 
-+ (CGFloat)heightForRowAtDataSource:(ZHCollectionViewDataSource *)dataSource
-                          indexPath:(NSIndexPath *)indexPath customHeightCompletionHandle:(ZHCollectionViewDataSourceCustomHeightCompletionHandle)customHeightCompletionHandle {
-    ZHCollectionViewCell *cell = [self cellForIndexPath:dataSource indexPath:indexPath];
-    if (!cell) {
-        return 0;
-    }
-    UICollectionViewCell *automaticHeightCell = [self cellForRowAtWithDataSource:dataSource indexPath:indexPath];
-    CGFloat automaticHeight = [automaticHeightCell sizeThatFits:CGSizeMake([UIScreen mainScreen].bounds.size.width, CGFLOAT_MAX)].height;
-    if (cell.height == NSNotFound && automaticHeight != CGFLOAT_MAX) {
-        cell.height = automaticHeight;
-    }
-    return [self heightWithCustomHandle:cell.height customCompletionHandle:customHeightCompletionHandle baseModel:cell];
-}
-
 + (void)didSelectRowAtWithDataSource:(ZHCollectionViewDataSource *)dataSource
                            indexPath:(NSIndexPath *)indexPath {
     ZHCollectionViewCell *CollectionViewCell = [self cellForIndexPath:dataSource indexPath:indexPath];
@@ -103,16 +91,6 @@ + (void)didSelectRowAtWithDataSource:(ZHCollectionViewDataSource *)dataSource
     [CollectionViewCell didSelectRowAtWithCell:cell indexPath:[group indexPathWithCell:CollectionViewCell indexPath:indexPath]];
 }
 
-+ (CGFloat)heightForHeaderInSectionWithDataSource:(ZHCollectionViewDataSource *)dataSource
-                                          section:(NSInteger)section customHeightCompletionHandle:(ZHCollectionViewDataSourceCustomHeightCompletionHandle)customHeightCompletionHandle {
-    return [self heightForHeaderFooterInSectionWithDataSource:dataSource section:section style:ZHCollectionViewHeaderFooterStyleHeader customHeightCompletionHandle:customHeightCompletionHandle];
-}
-
-+ (CGFloat)heightForFooterInSectionWithDataSource:(ZHCollectionViewDataSource *)dataSource
-                                          section:(NSInteger)section customHeightCompletionHandle:(ZHCollectionViewDataSourceCustomHeightCompletionHandle)customHeightCompletionHandle {
-    return [self heightForHeaderFooterInSectionWithDataSource:dataSource section:section style:ZHCollectionViewHeaderFooterStyleFooter customHeightCompletionHandle:customHeightCompletionHandle];
-}
-
 + (UICollectionReusableView *)viewForHeaderInSectionWithDataSource:(ZHCollectionViewDataSource *)dataSource
                                                               section:(NSInteger)section {
     return [self viewHeaderFooterInSectionWithDtaSource:dataSource section:section style:ZHCollectionViewHeaderFooterStyleHeader];
@@ -133,37 +111,7 @@ + (UICollectionReusableView *)viewHeaderFooterInSectionWithDtaSource:(ZHCollecti
     if (!group) {
         return nil;
     }
-    return [group headerFooterForStyle:style CollectionView:dataSource.CollectionView section:section];
-}
-
-+ (CGFloat)heightForHeaderFooterInSectionWithDataSource:(ZHCollectionViewDataSource *)dataSource
-                                                section:(NSInteger)section style:(ZHCollectionViewHeaderFooterStyle)style
-                           customHeightCompletionHandle:(ZHCollectionViewDataSourceCustomHeightCompletionHandle)customHeightCompletionHandle {
-    ZHCollectionViewGroup *group = [self groupForSectionWithDataSource:dataSource section:section];
-    if(!group) {
-        return 0;
-    }
-    NSInteger height = 0;
-    ZHCollectionViewBaseModel *baseModel;
-    UICollectionReusableView *headFooter = [self viewHeaderFooterInSectionWithDtaSource:dataSource section:section style:style];
-    CGFloat automaticHeight = [headFooter sizeThatFits:CGSizeMake([UIScreen mainScreen].bounds.size.width, CGFLOAT_MAX)].height;
-    switch (style) {
-        case ZHCollectionViewHeaderFooterStyleHeader: {
-            height = group.header.height;
-            baseModel = group.header;
-            
-        }
-            break;
-        case  ZHCollectionViewHeaderFooterStyleFooter: {
-            height = group.footer.height;
-            baseModel = group.footer;
-        }
-            break;
-    }
-    if (height == NSNotFound && automaticHeight != CGFLOAT_MAX) {
-        height = automaticHeight;
-    }
-    return [self heightWithCustomHandle:height customCompletionHandle:customHeightCompletionHandle baseModel:baseModel];
+    return [group headerFooterForStyle:style collectionView:dataSource.collectionView section:section];
 }
 
 + (CGFloat)heightWithCustomHandle:(CGFloat)height
@@ -205,9 +153,39 @@ + (NSIndexPath *)indexPathWithDataSource:(ZHCollectionViewDataSource *)dataSourc
     return [group indexPathWithCell:CollectionViewCell indexPath:indexPath];
 }
 
++ (CGSize)sizeForItemWithDataSource:(ZHCollectionViewDataSource *)dataSource indexPath:(NSIndexPath *)indexPath {
+	ZHCollectionViewCell *cell = [self cellForIndexPath:dataSource indexPath:indexPath];
+	if (!CGSizeEqualToSize(cell.size, CGSizeZero)) {
+		return cell.size;
+	}
+	UICollectionViewCell *collectionViewCell = [dataSource collectionViewWithClass:cell.anyClass];
+	[cell configCellWithCell:collectionViewCell indexPath:indexPath];
+	return [collectionViewCell sizeThatFits:[dataSource sizeFit]];
+}
+
++ (CGSize)referenceSizeForHeaderFooterWithDataSource:(ZHCollectionViewDataSource *)dataSource style:(ZHCollectionViewHeaderFooterStyle)style section:(NSUInteger)section {
+	ZHCollectionViewGroup *group = [self groupForSectionWithDataSource:dataSource section:section];
+	ZHCollectionViewHeaderFooter *headerFooter  = style == ZHCollectionViewHeaderFooterStyleHeader ? group.header : group.footer;
+	if (!CGSizeEqualToSize(headerFooter.size, CGSizeZero)) {
+		return headerFooter.size;
+	}
+	UICollectionReusableView *view = [[headerFooter.anyClass alloc] initWithFrame:CGRectZero];
+	[headerFooter setHeaderFooter:view section:section];
+	return [view sizeThatFits:[dataSource sizeFit]];
+}
+
+- (UICollectionViewCell *)collectionViewWithClass:(Class)class {
+	UICollectionViewCell *cell = [[class alloc] initWithFrame:CGRectZero];
+	return cell;
+}
+
+- (CGSize)sizeFit {
+	return CGSizeMake(CGRectGetWidth(_collectionView.frame), CGFLOAT_MAX);
+}
+
 - (void)registerClasss {
     for (ZHCollectionViewGroup *group in self.groups) {
-        [group registerHeaderFooterCellWithCollectionView:self.CollectionView];
+        [group registerHeaderFooterCellWithCollectionView:self.collectionView];
     }
 }
 
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewGroup.h b/ZHTableViewGroup/Classes/ZHCollectionViewGroup.h
@@ -31,7 +31,7 @@ typedef void(^ZHCollectionViewGroupAddHeaderFooterCompletionHandle)(ZHCollection
 
 - (ZHCollectionViewCell *)CollectionViewCellForIndexPath:(NSIndexPath *)indexPath;
 
-- (UICollectionReusableView *)headerFooterForStyle:(ZHCollectionViewHeaderFooterStyle)style CollectionView:(UICollectionView *)CollectionView section:(NSUInteger)section;
+- (UICollectionReusableView *)headerFooterForStyle:(ZHCollectionViewHeaderFooterStyle)style collectionView:(UICollectionView *)collectionView section:(NSUInteger)section;
 
 - (NSIndexPath *)indexPathWithCell:(ZHCollectionViewCell *)cell indexPath:(NSIndexPath *)indexPath;
 @end
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewGroup.m b/ZHTableViewGroup/Classes/ZHCollectionViewGroup.m
@@ -124,7 +124,7 @@ - (UICollectionReusableView *)headerFooterForStyle:(ZHCollectionViewHeaderFooter
     if (!headerFooter.identifier) {
         return nil;
     }
-    UICollectionReusableView *headerFooterView = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:headerFooterView.reuseIdentifier forIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
+    UICollectionReusableView *headerFooterView = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:headerFooter.identifier forIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];
     [headerFooter setHeaderFooter:headerFooterView section:section];
     return headerFooterView;
 }
diff --git a/ZHTableViewGroup/Classes/ZHCollectionViewHeaderFooter.h b/ZHTableViewGroup/Classes/ZHCollectionViewHeaderFooter.h
@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "ZHTableViewBaseModel.h"
+#import "ZHCollectionViewBaseModel.h"
 
 /**
  * 配置UICollectionVieweaderFooterView的回调
@@ -22,7 +22,7 @@ typedef NS_ENUM(NSUInteger, ZHCollectionViewHeaderFooterStyle) {
     ZHCollectionViewHeaderFooterStyleFooter
 };
 
-@interface ZHCollectionViewHeaderFooter<HeaderFooter:UICollectionReusableView *> : ZHTableViewBaseModel
+@interface ZHCollectionViewHeaderFooter<HeaderFooter:UICollectionReusableView *> : ZHCollectionViewBaseModel
 
 @property (nonatomic, assign) ZHCollectionViewHeaderFooterStyle style;
 
diff --git a/ZHTableViewGroupObjc.podspec b/ZHTableViewGroupObjc.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ZHTableViewGroupObjc'
-  s.version          = '3.0.0'
+  s.version          = '3.0.2'
   s.summary          = 'Manger UITableView DataSource More Cell Style'
 
   s.homepage         = 'https://github.com/josercc/ZHTableViewGroup'

Original file line number	Diff line number	Diff line change
`@@ -20,16 +20,6 @@ - (instancetype)initWithDataSource:(ZHCollectionViewDataSource *)dataSource {`
`20`	`20`	`return self;`
`21`	`21`	`}`
`22`	`22`
`23`		`-- (ZHCollectionViewDataSourceCustomHeightCompletionHandle)completionHandleWithCollectionView:(UICollectionView )collectionView heightAtIndexPath:(NSIndexPath )indexPath {`
`24`		`- ZHCollectionViewDataSourceCustomHeightCompletionHandle completionHandle = ^CGFloat(ZHCollectionViewBaseModel *model) {`
`25`		`- if (!model.customHeightCompletionHandle) {`
`26`		`- return model.height;`
`27`		`- }`
`28`		`- return model.customHeightCompletionHandle(collectionView,[ZHCollectionViewDataSource indexPathWithDataSource:_dataSource indexPath:indexPath],model);`
`29`		`- };`
`30`		`- return completionHandle;`
`31`		`-}`
`32`		`-`
`33`	`23`	`- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {`
`34`	`24`	`return [ZHCollectionViewDataSource numberOfSectionsWithDataSource:_dataSource];`
`35`	`25`	`}`
`@@ -56,15 +46,15 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa`
`56`	`46`	`}`
`57`	`47`
`58`	`48`	`- (CGSize)collectionView:(UICollectionView )collectionView layout:(UICollectionViewLayout)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath {`
`59`		`- return CGSizeZero;`
	`49`	`+ return [ZHCollectionViewDataSource sizeForItemWithDataSource:_dataSource indexPath:indexPath];`
`60`	`50`	`}`
`61`	`51`
`62`	`52`	`- (CGSize)collectionView:(UICollectionView )collectionView layout:(UICollectionViewLayout)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section {`
`63`		`- return CGSizeZero;`
	`53`	`+ return [ZHCollectionViewDataSource referenceSizeForHeaderFooterWithDataSource:_dataSource style:ZHCollectionViewHeaderFooterStyleHeader section:section];`
`64`	`54`	`}`
`65`	`55`
`66`	`56`	`- (CGSize)collectionView:(UICollectionView )collectionView layout:(UICollectionViewLayout )collectionViewLayout referenceSizeForFooterInSection:(NSInteger)section {`
`67`		`- return CGSizeZero;`
	`57`	`+ return [ZHCollectionViewDataSource referenceSizeForHeaderFooterWithDataSource:_dataSource style:ZHCollectionViewHeaderFooterStyleFooter section:section];`
`68`	`58`	`}`
`69`	`59`
`70`	`60`	`@end`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ @implementation ZHCollectionViewBaseModel`
`12`	`12`
`13`	`13`	`- (instancetype)init {`
`14`	`14`	`if (self = [super init]) {`
`15`		`- _height = NSNotFound;`
	`15`	`+ _size = CGSizeZero;`
`16`	`16`	`}`
`17`	`17`	`return self;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ - (UICollectionReusableView *)headerFooterForStyle:(ZHCollectionViewHeaderFooter`
`124`	`124`	`if (!headerFooter.identifier) {`
`125`	`125`	`return nil;`
`126`	`126`	`}`
`127`		`- UICollectionReusableView *headerFooterView = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:headerFooterView.reuseIdentifier forIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];`
	`127`	`+ UICollectionReusableView *headerFooterView = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifier:headerFooter.identifier forIndexPath:[NSIndexPath indexPathForItem:0 inSection:section]];`
`128`	`128`	`[headerFooter setHeaderFooter:headerFooterView section:section];`
`129`	`129`	`return headerFooterView;`
`130`	`130`	`}`