Skip to content

Commit 98a4bb7

Browse files
author
陈昭良
committed
1.1.6修改bug
1 parent 6258e62 commit 98a4bb7

File tree

11 files changed

+65
-30
lines changed

11 files changed

+65
-30
lines changed

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
### 导入
1111

12-
支持cocoapod导入，最新版本 1.1.5
12+
支持cocoapod导入，最新版本 1.1.6
1313

1414
```
1515
pod 'ZLCollectionViewFlowLayout'
@@ -179,6 +179,9 @@ Unable to find a specification for `ZLCollectionViewFlowLayout`
179179

180180
### 更新
181181

182+
##### v1.1.6 (2019.10.1)
183+
* 修复bug
184+
182185
##### v1.1.0 (2019.5.13)
183186
* 横向布局增加绝对定位布局
184187

‎ZLCollectionViewFlowLayout.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Pod::Spec.new do |s|
22

33
s.name = "ZLCollectionViewFlowLayout"
4-
s.version = "1.1.5"
4+
s.version = "1.1.6"
55
s.summary = "ZLCollectionViewFlowLayout"
66

77
s.description = <<-DESC

‎ZLCollectionViewFlowLayout/ZLCollectionViewBaseFlowLayout.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#import <UIKit/UIKit.h>
1010

11-
/***
12-
版本：1.1.5
13-
**/
11+
/**
12+
版本：1.1.6
13+
*/
1414

1515
NS_ASSUME_NONNULL_BEGIN
1616

‎ZLCollectionViewFlowLayout/ZLCollectionViewHorzontalLayout.m‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,13 @@ - (void)prepareLayout {
223223
free(columnWidths);
224224
}
225225
if (self.layoutType == ClosedLayout) {
226-
lastX -= minimumLineSpacing;
226+
if (itemCount > 0) {
227+
lastX -= minimumLineSpacing;
228+
}
229+
}
230+
if (itemCount > 0) {
231+
lastX += edgeInsets.right;
227232
}
228-
lastX += edgeInsets.right;
229233

230234
CGFloat backWidth = lastX-itemStartX+([self isAttachToTop:index]?headerW:0);
231235
if (backWidth < 0) {

‎ZLCollectionViewFlowLayout/ZLCollectionViewVerticalLayout.m‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,13 @@ - (void)prepareLayout {
542542
free(columnHeight);
543543
}
544544
if (self.layoutType == ClosedLayout) {
545-
lastY -= minimumLineSpacing;
545+
if (itemCount > 0) {
546+
lastY -= minimumLineSpacing;
547+
}
548+
}
549+
if (itemCount > 0) {
550+
lastY += edgeInsets.bottom;
546551
}
547-
lastY += edgeInsets.bottom;
548552

549553
#pragma mark 添加背景图
550554
CGFloat backHeight = lastY-itemStartY+([self isAttachToTop:index]?headerH:0);

‎demo/Pods/Pods.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎demo/UICollectionView+ARDynamicHeightLayoutCell/UICollectionView+ARDynamicCacheHeightLayoutCell.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
*
6464
* @param identifier cell's reuse identifier
6565
* @param indexPath indexPath
66-
* @param fixedWidth your expect height
6766
* @param configuration fill cell with you feed data
6867
*
6968
* @return the caculated cell's height

‎demo/ZLCollectionView.xcodeproj/project.pbxproj‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
BE13FE541EFBA5E800AFCD90 /* Project object */ = {
322322
isa = PBXProject;
323323
attributes = {
324-
LastUpgradeCheck = 0830;
324+
LastUpgradeCheck = 1100;
325325
ORGANIZATIONNAME = "zhaoliang chen";
326326
TargetAttributes = {
327327
BE13FE5B1EFBA5E900AFCD90 = {
@@ -342,10 +342,9 @@
342342
};
343343
buildConfigurationList = BE13FE571EFBA5E800AFCD90 /* Build configuration list for PBXProject "ZLCollectionView" */;
344344
compatibilityVersion = "Xcode 3.2";
345-
developmentRegion = English;
345+
developmentRegion = en;
346346
hasScannedForEncodings = 0;
347347
knownRegions = (
348-
English,
349348
en,
350349
Base,
351350
);
@@ -510,21 +509,30 @@
510509
isa = XCBuildConfiguration;
511510
buildSettings = {
512511
ALWAYS_SEARCH_USER_PATHS = NO;
512+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
513513
CLANG_ANALYZER_NONNULL = YES;
514514
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
515515
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
516516
CLANG_CXX_LIBRARY = "libc++";
517517
CLANG_ENABLE_MODULES = YES;
518518
CLANG_ENABLE_OBJC_ARC = YES;
519+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
519520
CLANG_WARN_BOOL_CONVERSION = YES;
521+
CLANG_WARN_COMMA = YES;
520522
CLANG_WARN_CONSTANT_CONVERSION = YES;
523+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
521524
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
522525
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
523526
CLANG_WARN_EMPTY_BODY = YES;
524527
CLANG_WARN_ENUM_CONVERSION = YES;
525528
CLANG_WARN_INFINITE_RECURSION = YES;
526529
CLANG_WARN_INT_CONVERSION = YES;
530+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
531+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
532+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
527533
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
534+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
535+
CLANG_WARN_STRICT_PROTOTYPES = YES;
528536
CLANG_WARN_SUSPICIOUS_MOVE = YES;
529537
CLANG_WARN_UNREACHABLE_CODE = YES;
530538
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -560,21 +568,30 @@
560568
isa = XCBuildConfiguration;
561569
buildSettings = {
562570
ALWAYS_SEARCH_USER_PATHS = NO;
571+
CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
563572
CLANG_ANALYZER_NONNULL = YES;
564573
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
565574
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
566575
CLANG_CXX_LIBRARY = "libc++";
567576
CLANG_ENABLE_MODULES = YES;
568577
CLANG_ENABLE_OBJC_ARC = YES;
578+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
569579
CLANG_WARN_BOOL_CONVERSION = YES;
580+
CLANG_WARN_COMMA = YES;
570581
CLANG_WARN_CONSTANT_CONVERSION = YES;
582+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
571583
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
572584
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
573585
CLANG_WARN_EMPTY_BODY = YES;
574586
CLANG_WARN_ENUM_CONVERSION = YES;
575587
CLANG_WARN_INFINITE_RECURSION = YES;
576588
CLANG_WARN_INT_CONVERSION = YES;
589+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
590+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
591+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
577592
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
593+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
594+
CLANG_WARN_STRICT_PROTOTYPES = YES;
578595
CLANG_WARN_SUSPICIOUS_MOVE = YES;
579596
CLANG_WARN_UNREACHABLE_CODE = YES;
580597
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎demo/ZLCollectionView/ZLCollectionFlowLayout/ZLCollectionViewBaseFlowLayout.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#import <UIKit/UIKit.h>
1010

11-
/***
12-
版本：1.1.3
13-
**/
11+
/**
12+
版本：1.1.6
13+
*/
1414

1515
NS_ASSUME_NONNULL_BEGIN
1616

‎demo/ZLCollectionView/ZLCollectionFlowLayout/ZLCollectionViewHorzontalLayout.m‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,13 @@ - (void)prepareLayout {
223223
free(columnWidths);
224224
}
225225
if (self.layoutType == ClosedLayout) {
226-
lastX -= minimumLineSpacing;
226+
if (itemCount > 0) {
227+
lastX -= minimumLineSpacing;
228+
}
229+
}
230+
if (itemCount > 0) {
231+
lastX += edgeInsets.right;
227232
}
228-
lastX += edgeInsets.right;
229233

230234
CGFloat backWidth = lastX-itemStartX+([self isAttachToTop:index]?headerW:0);
231235
if (backWidth < 0) {

0 commit comments

Comments
 (0)