优化

Author: CoderFM

Example/FMLayoutKit/FMAddViewController.m

@@ -164,7 +164,7 @@ - (void)viewDidLoad {
         section.cellElement = [FMLayoutElement elementWithViewClass:[FMCollectionCustomCell class]];
         [section setClickCellBlock:^(FMLayoutBaseSection * _Nonnull section, NSInteger item) {
             FMHorizontalLayoutController *vc = [[FMHorizontalLayoutController alloc] init];
-            [self.navigationController pushViewController:vc animated:YES];
+            [weakSelf.navigationController pushViewController:vc animated:YES];
         }];
         [self.shareSections addObject:section];
 //        self.firstSection = section;

Example/FMLayoutKit/FMViewController.m

@@ -77,7 +77,7 @@ - (void)viewDidLoad {
     self.sections = [NSMutableArray array];
     __weak typeof(self) weakSelf = self;
 //    [FMLayoutDebugLog closeLog];
-//    FMLayoutCloseLog();
+//    FMLayoutOpenLog();
     {
         FMLayoutDynamicSection *section = [FMLayoutDynamicSection sectionWithSectionInset:UIEdgeInsetsMake(5, 15, 5, 15) itemSpace:10 lineSpace:10 column:2];
 

Example/FMLayoutKit/LS_HomeActivityCell.m

@@ -12,6 +12,10 @@
 
 @implementation LS_HomeActivityCell
 
+- (void)dealloc{
+    
+}
+
 - (instancetype)initWithFrame:(CGRect)frame
 {
     self = [super initWithFrame:frame];

FMLayoutKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FMLayoutKit'
-  s.version          = '1.1.5'
+  s.version          = '1.1.6'
   s.summary          = 'A short description of FMLayoutKit.'
 
 # This description is used to generate tags and improve search results.

FMLayoutKit/Classes/Sections/FMLayoutDynamicSection.h

@@ -30,6 +30,8 @@ typedef CGFloat(^FMLayoutItemOtherBlock)(id section, NSInteger item);
 ///block返回手动计算的高度  优先级比自动的高
 @property(nonatomic, copy)FMLayoutItemOtherBlock otherBlock;
 
+- (CGFloat)autoHeightVerticalWithWidth:(CGFloat)fixedWidth index:(NSInteger)index;
+
 @end
 
 NS_ASSUME_NONNULL_END

FMLayoutKit/Classes/Sections/FMLayoutDynamicSection.m

@@ -13,10 +13,43 @@
 
 @interface FMLayoutDynamicSection ()
 
+@property(nonatomic, strong)NSMapTable *autoHeightCells;
+
 @end
 
 @implementation FMLayoutDynamicSection
 
+- (NSMapTable *)autoHeightCells{
+    if (_autoHeightCells == nil) {
+        _autoHeightCells = [NSMapTable mapTableWithKeyOptions:NSPointerFunctionsWeakMemory valueOptions:NSPointerFunctionsStrongMemory];
+    }
+    return _autoHeightCells;
+}
+
+- (CGFloat)autoHeightVerticalWithWidth:(CGFloat)fixedWidth index:(NSInteger)index{
+    CGFloat itemOther = 0;
+    if (self.direction == FMLayoutDirectionHorizontal) {
+        @throw [NSException exceptionWithName:@"autoHeightFixedWidth must for FMLayoutDirectionVertical" reason:@"FMLayoutDynamicSection" userInfo:nil];
+    }
+    if (self.deqCellReturnElement) {
+        FMLayoutElement *element = self.deqCellReturnElement(self, index);
+        UICollectionViewCell *cell = [self.autoHeightCells objectForKey:element.viewClass];
+        if (cell == nil) {
+            if (element.isNib) {
+                cell = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass(element.viewClass) owner:nil options:nil] lastObject];
+            } else {
+                cell = [[element.viewClass alloc] init];
+            }
+            [self.autoHeightCells setObject:cell forKey:element.viewClass];
+        }
+        if (self.configurationCell) {
+            self.configurationCell(self ,cell, index);
+        }
+        itemOther = [cell systemLayoutSizeFittingSize:CGSizeMake(fixedWidth, MAXFLOAT)].height;
+    }
+    return itemOther;
+}
+
 - (id)copyWithZone:(NSZone *)zone{
     FMLayoutDynamicSection *section = [super copyWithZone:zone];
     section.autoHeightFixedWidth = self.autoHeightFixedWidth;
@@ -64,22 +97,7 @@ - (FMCollectionLayoutAttributes *)getItemAttributesWithIndex:(NSInteger)j{
     CGFloat itemFixed = self.cellFixedSize;
     CGFloat itemOther = 0;
     if (self.autoHeightFixedWidth) {
-        if (self.direction == FMLayoutDirectionHorizontal) {
-            @throw [NSException exceptionWithName:@"autoHeightFixedWidth must for FMLayoutDirectionVertical" reason:@"FMLayoutDynamicSection" userInfo:nil];
-        }
-        if (self.deqCellReturnElement) {
-            UICollectionViewCell *cell;
-            FMLayoutElement *element = self.deqCellReturnElement(self, j);
-            if (element.isNib) {
-                cell = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass(element.viewClass) owner:nil options:nil] lastObject];
-            } else {
-                cell = [[element.viewClass alloc] init];
-            }
-            if (self.configurationCell) {
-                self.configurationCell(self ,cell, j);
-            }
-            itemOther = [cell systemLayoutSizeFittingSize:CGSizeMake(itemFixed, MAXFLOAT)].height;
-        }
+        itemOther = [self autoHeightVerticalWithWidth:itemFixed index:j];
     } else {
         itemOther = !self.otherBlock?0:self.otherBlock(self, j);
     }
@@ -106,8 +124,6 @@ - (FMCollectionLayoutAttributes *)getItemAttributesWithIndex:(NSInteger)j{
     return itemAttr;
 }
 
-
-
 - (UICollectionViewCell *)dequeueReusableCellForIndexPath:(NSIndexPath *)indexPath collectionView:(nonnull UICollectionView *)collectionView{
     return [collectionView dequeueReusableCellWithReuseIdentifier:self.deqCellReturnElement(self, indexPath.item).reuseIdentifier forIndexPath:indexPath];
 }

FMLayoutKit/Classes/Sections/FMLayoutScaleSection.m

@@ -114,22 +114,7 @@ - (FMCollectionLayoutAttributes *)getItemAttributesWithIndex:(NSInteger)j{
     CGFloat itemFixed = model.fixedSize;
     CGFloat itemOther = 0;
     if (self.autoHeightFixedWidth) {
-        if (self.direction == FMLayoutDirectionHorizontal) {
-            @throw [NSException exceptionWithName:@"autoHeightFixedWidth must for FMLayoutDirectionVertical" reason:@"FMLayoutDynamicSection" userInfo:nil];
-        }
-        if (self.deqCellReturnElement) {
-            UICollectionViewCell *cell;
-            FMLayoutElement *element = self.deqCellReturnElement(self, j);
-            if (element.isNib) {
-                cell = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass(element.viewClass) owner:nil options:nil] lastObject];
-            } else {
-                cell = [[element.viewClass alloc] init];
-            }
-            if (self.configurationCell) {
-                self.configurationCell(self ,cell, j);
-            }
-            itemOther = [cell systemLayoutSizeFittingSize:CGSizeMake(itemFixed, MAXFLOAT)].height;
-        }
+        itemOther = [self autoHeightVerticalWithWidth:itemFixed index:j];
     } else {
         itemOther = !self.otherBlock?0:self.otherBlock(self, j);
     }

README.md

@@ -209,6 +209,9 @@ multi.dataSource = self;
 
 ```
 #### 版本更新
+2020-08-02(1.1.6)
+自动计算高度优化
+
 2020-07-24(1.1.3)
 iOS10,11自动计算高度奔溃的问题修复