修复一些小问题

Author: CoderFM

Example/FMLayoutKit/FMCollectionViewCell.h

@@ -11,6 +11,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface FMCollectionViewCell : UICollectionViewCell
+@property (weak, nonatomic) IBOutlet UILabel *label;
 
 @end
 

Example/FMLayoutKit/FMCollectionViewCell.xib

@@ -33,6 +33,9 @@
             </constraints>
             <viewLayoutGuide key="safeArea" id="SEy-5g-ep8"/>
             <size key="customSize" width="138" height="147"/>
+            <connections>
+                <outlet property="label" destination="ZJk-95-5MF" id="9tF-3q-tC8"/>
+            </connections>
             <point key="canvasLocation" x="-88" y="67"/>
         </collectionViewCell>
     </objects>

Example/FMLayoutKit/FMCombineViewController.m

@@ -102,6 +102,7 @@ @implementation FMCombineViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
     FMLayoutView *view = [[FMLayoutView alloc] init];
     //    view.layout.minContentSize = 1000;
     view.backgroundColor = [UIColor whiteColor];
@@ -115,11 +116,13 @@ - (void)viewDidLoad {
     //    [self addCrossFixedSections];
 //    [self addScaleSection];
     self.collectionView.enableLongPressDrag = YES;
-    [self.collectionView setConfigureSourceView:^UIView * _Nonnull(UICollectionViewCell * _Nonnull sourceCell) {
-        UIView *source = [[UIView alloc] initWithFrame:sourceCell.frame];
-        source.backgroundColor = [UIColor purpleColor];
-        return source;
-    }];
+//    [self.collectionView setConfigureSourceView:^UIView * _Nonnull(UICollectionViewCell * _Nonnull sourceCell) {
+//        UIView *source = [[UIView alloc] initWithFrame:sourceCell.frame];
+//        source.backgroundColor = [UIColor purpleColor];
+//        return source;
+//    }];
+    
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"刷新" style:UIBarButtonItemStylePlain target:self.collectionView action:@selector(reloadData)];
 }
 
 - (void)addSections{
@@ -143,17 +146,18 @@ - (void)addSections{
         section.footer.topMargin = 10;
 
         section.itemSize = CGSizeMake(200, 100);
-        section.itemDatas = [@[@"1", @"2", @"3"] mutableCopy];
+        section.itemDatas = [@[@"1", @"2", @"3", @"4", @"5", @"6", @"7", @"8", @"9"] mutableCopy];
         section.cellElement = [FMLayoutElement elementWithViewClass:[FMCollectionViewCell class] isNib:YES];
         [section setConfigureCellData:^(FMLayoutBaseSection * _Nonnull section, UICollectionViewCell * _Nonnull cell, NSInteger item) {
-            
+            [(FMCollectionViewCell *)cell label].text = section.itemDatas[item];
         }];
 
         [section setClickCellBlock:^(FMLayoutBaseSection * _Nonnull section, NSInteger item) {
             FMAddViewController *add = [[FMAddViewController alloc] init];
             [weakSelf.navigationController pushViewController:add animated:YES];
         }];
 
+        section.canLongPressExchange = YES;
         [sections addObject:section];
     }
     {
@@ -162,10 +166,10 @@ - (void)addSections{
             FMLayoutFixedSection *section = [FMLayoutFixedSection sectionWithSectionInset:UIEdgeInsetsMake(0, 0, 0, 0) itemSpace:10 lineSpace:10 column:2];
 
             section.itemSize = CGSizeMake(150, 100);
-            section.itemDatas = [@[@"1", @"2", @"3", @"2", @"3", @"2", @"3", @"2", @"3", @"2", @"3"] mutableCopy];
+            section.itemDatas = [@[@"0-1", @"0-2", @"0-3", @"0-4", @"0-5", @"0-6", @"0-7", @"0-8", @"0-9", @"0-10", @"0-11"] mutableCopy];
             section.cellElement = [FMLayoutElement elementWithViewClass:[FMCollectionCustomCell class]];
             [section setConfigureCellData:^(FMLayoutBaseSection * _Nonnull section, UICollectionViewCell * _Nonnull cell, NSInteger item) {
-                [(FMCollectionCustomCell *)cell label].text = [NSString stringWithFormat:@"%ld", (long)item];
+                [(FMCollectionCustomCell *)cell label].text = section.itemDatas[item];
             }];
             [section setClickCellBlock:^(FMLayoutBaseSection * _Nonnull section, NSInteger item) {
 
@@ -176,7 +180,7 @@ - (void)addSections{
         {
             FMLayoutAbsoluteSection *section = [FMLayoutAbsoluteSection sectionWithSectionInset:UIEdgeInsetsMake(0, 0, 0, 0) itemSpace:0 lineSpace:0 column:0];
 
-            section.itemDatas = [@[@"1", @"2", @"3"] mutableCopy];
+            section.itemDatas = [@[@"1-1", @"1-2", @"1-3"] mutableCopy];
             section.cellElements = @[[FMLayoutElement elementWithViewClass:[FMCollectionCustomCell class]]];
             [section setDeqCellReturnReuseId:^NSString * _Nonnull(FMLayoutDynamicSection * _Nonnull section, NSInteger index) {
                 return [section.cellElements firstObject].reuseIdentifier;
@@ -195,7 +199,7 @@ - (void)addSections{
                 }
             }];
             [section setConfigureCellData:^(FMLayoutBaseSection * _Nonnull section, UICollectionViewCell * _Nonnull cell, NSInteger item) {
-                [(FMCollectionCustomCell *)cell label].text = [NSString stringWithFormat:@"%ld", (long)item];
+                [(FMCollectionCustomCell *)cell label].text = section.itemDatas[item];
             }];
             [section setClickCellBlock:^(FMLayoutBaseSection * _Nonnull section, NSInteger item) {
 

FMLayoutKit.podspec

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

FMLayoutKit/Classes/FMLayoutView.m

@@ -264,7 +264,6 @@ - (void)initSourceView{
         UIImageView *imageView = [[UIImageView alloc] initWithImage:image];
 
         sourceView = [[UIView alloc] initWithFrame:sourceCell.frame];
-        sourceView.backgroundColor = [UIColor purpleColor];
         sourceView.layer.shadowColor = [UIColor darkGrayColor].CGColor;
         sourceView.layer.shadowOffset = CGSizeMake(0, 0);
         sourceView.layer.shadowOpacity = 0.7;

FMLayoutKit/Classes/Sections/FMLayoutBaseSection.m

@@ -379,7 +379,9 @@ - (CGFloat)crossSingleSectionSize{
 }
 
 - (void)exchangeObjectAtIndex:(NSInteger)index toIndex:(NSInteger)toIndex{
-    [self.itemDatas exchangeObjectAtIndex:index withObjectAtIndex:toIndex];
+    id obj = self.itemDatas[index];
+    [self.itemDatas removeObjectAtIndex:index];
+    [self.itemDatas insertObject:obj atIndex:toIndex];
 }
 
 - (UICollectionViewCell *)dequeueReusableCellForIndexPath:(NSIndexPath *)indexPath{

FMLayoutKit/Classes/Sections/FMLayoutCombineSection.h

@@ -8,7 +8,7 @@
 #import "FMLayoutBaseSection.h"
 
 NS_ASSUME_NONNULL_BEGIN
-///可以将不同Cell, 不同的布局方式,  放到同一个分组去合并,只合并cell, 如果子分组有头部和底部讲被忽略,合并分组的头部与底部不影响配置, cell的点击事件已经在init方法中配置block分发到子分组上
+///可以将不同Cell, 不同的布局方式,  放到同一个分组去合并,只合并cell, 如果子分组有头部和底部讲被忽略,合并分组的头部与底部不影响配置, cell的点击事件已经在init方法中配置block分发到子分组上  合并分组不支持拖拽排序  想要支持  可以继承自该类重写canLongPressExchange的get方法  并实现- (void)exchangeObjectAtIndex:(NSInteger)index toIndex:(NSInteger)toIndex;
 @interface FMLayoutCombineSection : FMLayoutBaseSection
 
 + (instancetype)combineSections:(NSArray<FMLayoutBaseSection *> *)sections;

FMLayoutKit/Classes/Sections/FMLayoutCombineSection.m

@@ -30,6 +30,10 @@ @interface FMLayoutCombineSection ()
 
 @implementation FMLayoutCombineSection
 
+- (BOOL)canLongPressExchange{
+    return NO;
+}
+
 - (NSArray<FMLayoutBaseSection *> *)subSections{
     return [self.sections valueForKey:@"section"];
 }
@@ -72,7 +76,7 @@ - (instancetype)init
                     if (com.section.clickCellBlock) {
                         com.section.clickCellBlock(com.section, item - com.start);
                     }
-                    break;
+                    return;
                 }
             }
         }];
@@ -82,7 +86,7 @@ - (instancetype)init
                     if (com.section.configureCellData) {
                         com.section.configureCellData(com.section, cell,item - com.start);
                     }
-                    break;
+                    return;
                 }
             }
         }];
@@ -194,39 +198,4 @@ - (CGFloat)crossSingleSectionSize{
     return maxSize;
 }
 
-- (void)exchangeObjectAtIndex:(NSInteger)index toIndex:(NSInteger)toIndex{
-    NSMutableArray *get;
-    NSMutableArray *inset;
-    NSInteger getIndex = 0;
-    NSInteger insetIndex = 0;
-    NSInteger start = 0;
-    NSArray *sections = self.subSections;
-    for (FMLayoutBaseSection *section in sections) {
-        if (index < start + section.itemCount) {
-            if (!get) {
-                get = section.itemDatas;
-                getIndex = index - start;
-            }
-        }
-        if (toIndex < start + section.itemCount) {
-            if (!inset) {
-                inset = section.itemDatas;
-                insetIndex = toIndex - start;
-            }
-        }
-        if (get && inset) {
-            break;
-        }
-        start += section.itemCount;
-    }
-    id getObj = [get objectAtIndex:getIndex];
-    id insetObj = [inset objectAtIndex:insetIndex];
-    if (get == inset) {
-        [get exchangeObjectAtIndex:getIndex withObjectAtIndex:insetIndex];
-    } else {
-        [get replaceObjectAtIndex:getIndex withObject:insetObj];
-        [inset replaceObjectAtIndex:insetIndex withObject:getObj];
-    }
-}
-
 @end

README.md

@@ -201,18 +201,19 @@ multi.dataSource = self;
 - (NSInteger)numberOfScreenInTesla:(nonnull FMTeslaLayoutView *)tesla {
     return 4;
 }
-/// 对应页面的view需要展示的Sections集合
-- (nonnull NSMutableArray<FMLayoutBaseSection *> *)tesla:(nonnull FMTeslaLayoutView *)tesla sectionsInScreenIndex:(NSInteger)screenIndex {
-    return [self.sections mutableCopy];
-}
+
 /// 头部共享的集合
 - (NSArray<FMLayoutBaseSection *> *)shareSectionsInTesla:(FMTeslaLayoutView *)tesla{
     return self.shareSections;
 }
 
 ```
 #### 版本更新
-2020-07-21(1.0.9)
+2020-07-21(1.1.1)
+合并取消支持拖拽, 会出现多重问题, 拖拽切换数据的问题修复
+
+2020-07-21(1.1.0)
+清楚长按拖拽View的背景色
 长按拖拽可控制分组中某些item不支持拖拽, 修复合并分组的奔溃问题
 
 2020-07-20(1.0.8)