新增可复制分组信息（布局还是需要重新计算）

CoderFM · Jul 10, 2020 · 1e88a9a · 1e88a9a
1 parent 9a635c4
commit 1e88a9a
Show file tree

Hide file tree

Showing 19 changed files with 236 additions and 61 deletions.
diff --git a/Example/FMLayoutKit/FMCollViewController.m b/Example/FMLayoutKit/FMCollViewController.m
@@ -33,7  33,9 @@ - (void)dealloc{
 }
 
 - (void)reloadSection{
- [self.collectionView scrollToItemAtIndexPath:[NSIndexPath indexPathForItem:1 inSection:4] atScrollPosition:UICollectionViewScrollPositionTop animated:YES];
     FMLayoutBaseSection *section = [self.shareSections[2] copy];
     [self.collectionView insertLayoutSection:section atIndex:1];
     [self.collectionView reloadData];
     return;
     {
         FMLayoutFixedSection *section = [FMLayoutFixedSection sectionWithSectionInset:UIEdgeInsetsMake(0, 15, 15, 15) itemSpace:10 lineSpace:10 column:3];
@@ -51,7  53,10 @@ - (void)reloadSection{
         section.cellElement = [FMLayoutElement elementWithViewClass:[FMCollectionCustomCell class]];
         [self.collectionView insertLayoutSection:section atIndex:1];
     }
-    [self.collectionView reloadData];
 //    [self.collectionView.layout invalidateLayout];
 //    [self.collectionView insertSections:[NSIndexSet indexSetWithIndex:1]];
 
 //    [self.collectionView reloadData];
 }
 
 - (void)addItem{
@@ -66,7  71,7 @@ - (void)insetItem{
 
 - (void)deleteSection{
     [self.collectionView deleteLayoutSectionAt:1];
-    [self.collectionView reloadData];
 //    [self.collectionView reloadData];
 }
 
 - (void)deleteItem{
@@ -76,7  81,7 @@ - (void)deleteItem{
 
 - (void)reloadItem{
     [[self.shareSections firstObject] markChangeAt:3];
-    [self.collectionView reloadData];
 //    [self.collectionView reloadData];
 }
 
 - (void)addSection{
@@ -94,7  99,8 @@ - (void)addSection{
         section.itemSize = CGSizeMake(100, 100);
         section.itemDatas = [@[@"1", @"2", @"3", @"1", @"2", @"3"] mutableCopy];
         section.cellElement = [FMLayoutElement elementWithViewClass:[FMCollectionCustomCell class]];
-        [self.shareSections addObject:section];
 //        [self.shareSections addObject:section];
         [self.collectionView appendLayoutSections:@[section]];
     }
     [self.collectionView reloadData];
 }

diff --git a/FMLayoutKit/Classes/Cross/FMLayoutCrossSection.m b/FMLayoutKit/Classes/Cross/FMLayoutCrossSection.m
@@ -19,6  19,27 @@ @interface FMLayoutCrossSection ()
 
 @implementation FMLayoutCrossSection
 
 - (id)copyWithZone:(NSZone *)zone{
     FMLayoutCrossSection *section = [super copyWithZone:zone];
 
     section.cellElement = [self.cellElement copy];
     section.configureCellData = self.configureCellData;
 
     section.autoMaxSize = self.autoMaxSize;
     section.size = self.size;
     section.canReuseCell = self.canReuseCell;
 
     NSMutableArray *sections = [NSMutableArray array];
     for (FMLayoutBaseSection *s in self.sections) {
         [sections addObject:[s copy]];
     }
     section.sections = sections;
     section.scrollDidScroll = [self.scrollDidScroll copy];
     section.configureCollectionView = [self.configureCollectionView copy];
 
     return section;
 }
 
 - (FMLayoutDirection)crossDirection{
     return self.direction == FMLayoutDirectionVertical ? FMLayoutDirectionHorizontal : FMLayoutDirectionVertical;
 }
@@ -48,7  69,7 @@ - (instancetype)init
     self = [super init];
     if (self) {
         self.cellElement = [FMLayoutElement elementWithViewClass:[FMLayoutCrossCell class]];
-        self.canReuseCell = YES;
         self.canReuseCell = NO;
         [self setConfigureCellData:^(FMLayoutBaseSection * _Nonnull section, UICollectionViewCell * _Nonnull cell, NSInteger item) {
             FMLayoutCrossCell *hCell = (FMLayoutCrossCell *)cell;
             hCell.crossSection = (FMLayoutCrossSection *)section;

diff --git a/FMLayoutKit/Classes/Element/FMLayoutElement.h b/FMLayoutKit/Classes/Element/FMLayoutElement.h
@@ -11,11  11,11 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface FMLayoutElement : NSObject
 @interface FMLayoutElement : NSObject<NSCopying>
 
 @property(nonatomic, copy)NSString *reuseIdentifier;
 @property(nonatomic, assign)BOOL isNib;
-@property(nonatomic, assign)Class viewClass;///视图的类
 @property(nonatomic, weak)Class viewClass;///视图的类
 
   (instancetype)elementWithViewClass:(Class)vCalss;
   (instancetype)elementWithViewClass:(Class)vCalss isNib:(BOOL)isNib;

diff --git a/FMLayoutKit/Classes/Element/FMLayoutElement.m b/FMLayoutKit/Classes/Element/FMLayoutElement.m
@@ -16,6  16,14 @@ @interface FMLayoutElement ()
 
 @implementation FMLayoutElement
 
 - (id)copyWithZone:(NSZone *)zone{
     FMLayoutElement *element = [[[self class] allocWithZone:zone] init];
     element.reuseIdentifier = self.reuseIdentifier;
     element.isNib = self.isNib;
     element.viewClass = self.viewClass;
     return element;
 }
 
   (instancetype)elementWithViewClass:(Class)vCalss{
     return [self elementWithViewClass:vCalss isNib:NO];
 }

diff --git a/FMLayoutKit/Classes/Element/FMLayoutFooter.m b/FMLayoutKit/Classes/Element/FMLayoutFooter.m
@@ -14,4  14,10 @@ - (NSString *)elementKind{
     return UICollectionElementKindSectionFooter;
 }
 
 - (id)copyWithZone:(NSZone *)zone{
     FMLayoutFooter *footer = [super copyWithZone:zone];
     footer.topMargin = self.topMargin;
     return footer;
 }
 
 @end
diff --git a/FMLayoutKit/Classes/Element/FMLayoutHeader.m b/FMLayoutKit/Classes/Element/FMLayoutHeader.m
@@ -10,8  10,23 @@
 
 @implementation FMLayoutHeader
 
   (instancetype)elementSize:(CGFloat)size viewClass:(Class)vClass isNib:(BOOL)isNib reuseIdentifier:(NSString *)reuseIdentifier{
     FMLayoutHeader *header = [super elementSize:size viewClass:vClass isNib:isNib reuseIdentifier:reuseIdentifier];
     return header;
 }
 
 - (NSString *)elementKind{
     return UICollectionElementKindSectionHeader;
 }
 
 - (id)copyWithZone:(NSZone *)zone{
     FMLayoutHeader *header = [super copyWithZone:zone];
     header.lastMargin = self.lastMargin;
     header.type = self.type;
     header.suspensionTopMargin = self.suspensionTopMargin;
     header.isStickTop = self.isStickTop;
     header.minSize = self.minSize;
     return header;
 }
 
 @end
diff --git a/FMLayoutKit/Classes/Element/FMSupplementary.m b/FMLayoutKit/Classes/Element/FMSupplementary.m
@@ -14,6  14,15 @@ @interface FMSupplementary ()
 
 @implementation FMSupplementary
 
 - (id)copyWithZone:(NSZone *)zone{
     FMSupplementary *supp = [super copyWithZone:zone];
     supp.size = self.size;
     supp.zIndex = self.zIndex;
     supp.autoHeight = self.autoHeight;
     supp.configureDataAutoHeight = [self.configureDataAutoHeight copy];
     return supp;
 }
 
   (instancetype)elementSize:(CGFloat)size viewClass:(Class)vClass{
     return [self elementSize:size viewClass:vClass isNib:NO];
 }

diff --git a/FMLayoutKit/Classes/FMCollectionLayoutAttributes.m b/FMLayoutKit/Classes/FMCollectionLayoutAttributes.m
@@ -14,6  14,9 @@
 @implementation FMCollectionLayoutAttributes
 
   (instancetype)headerAttributesWithSection:(FMLayoutBaseSection *)section{
     if (!section.header) {
         return nil;
     }
     FMCollectionLayoutAttributes *header = [self layoutAttributesForSupplementaryViewOfKind:UICollectionElementKindSectionHeader withIndexPath:section.indexPath];
     header.direction = section.direction;
     if (header.direction == FMLayoutDirectionVertical) {
@@ -197,6  200,9 @@   (instancetype)suspensionShowHeaderAttributes:(FMLayoutBaseSection *)section{
 
 
   (instancetype)footerAttributesWithSection:(FMLayoutBaseSection *)section{
     if (!section.footer) {
         return nil;
     }
     FMCollectionLayoutAttributes *footer = [self layoutAttributesForSupplementaryViewOfKind:UICollectionElementKindSectionFooter withIndexPath:section.indexPath];
     footer.direction = section.direction;
     if (footer.direction == FMLayoutDirectionVertical) {
@@ -221,6  227,9 @@ - (instancetype)updateFooterAttributesWithSection:(FMLayoutBaseSection *)section
 }
 
   (instancetype)bgAttributesWithSection:(FMLayoutBaseSection *)section{
     if (!section.background) {
         return nil;
     }
     FMCollectionLayoutAttributes *bgAttr = [self layoutAttributesForSupplementaryViewOfKind:section.background.elementKind withIndexPath:section.indexPath];
     bgAttr.direction = section.direction;
     if (bgAttr.direction == FMLayoutDirectionVertical) {

diff --git a/FMLayoutKit/Classes/FMLayout.m b/FMLayoutKit/Classes/FMLayout.m
@@ -30,11  30,6 @@ - (void)prepareLayout{
     [self handleSections];
 }
 
-- (void)invalidateLayout{
-
-    [super invalidateLayout];
-}
-
 - (void)setSections:(NSMutableArray<FMLayoutBaseSection *> *)sections{
 
     if (_sections == sections) {

diff --git a/FMLayoutKit/Classes/FMLayoutView.h b/FMLayoutKit/Classes/FMLayoutView.h
@@ -22,6  22,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface FMLayoutView : UICollectionView
 @property(nonatomic, weak)id<FMCollectionLayoutViewConfigurationDelegate> configuration;
 @property(nonatomic, weak)FMLayout *layout;
 ///重写了set get 目标指向->layout.sections
 @property(nonatomic)NSMutableArray<FMLayoutBaseSection *> *sections;
 @property(nonatomic, assign)BOOL reloadOlnyChanged;
 - (instancetype)initWithFrame:(CGRect)frame collectionViewLayout:(UICollectionViewLayout *)layout NS_UNAVAILABLE;
 - (instancetype)initHorizontal;
@@ -38,8  40,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 /// 交换分组
 - (void)exchangeLayoutSection:(NSUInteger)index to:(NSUInteger)to;
-
 /// 循环遍历出更改过的sections   如果有过增删分组 请使用原有的reloadData方法
 - (void)reloadChangedSectionsData;
 ///获取到滚动到indexPath位置偏移量   如果获取到的不准确  请先调用layoutIfNeeded方法
 - (CGPoint)contentOffsetScrollToIndexPath:(NSIndexPath *)indexPath atScrollPosition:(UICollectionViewScrollPosition)scrollPosition;
 
 @end