diff --git a/Pods/Pods.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..2d9fe945 --- /dev/null +++ b/Pods/Pods.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,19 @@ + + + + + SchemeUserState + + Pods-SDCycleScrollView.xcscheme + + orderHint + 1 + + SDWebImage.xcscheme + + orderHint + 2 + + + + diff --git a/SDCycleScrollView.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist b/SDCycleScrollView.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 00000000..0ef0b983 --- /dev/null +++ b/SDCycleScrollView.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,14 @@ + + + + + SchemeUserState + + SDCycleScrollView.xcscheme + + orderHint + 0 + + + + diff --git a/SDCycleScrollView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SDCycleScrollView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/SDCycleScrollView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SDCycleScrollView.xcworkspace/xcuserdata/CodeX.xcuserdatad/UserInterfaceState.xcuserstate b/SDCycleScrollView.xcworkspace/xcuserdata/CodeX.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 00000000..29cd43c1 Binary files /dev/null and b/SDCycleScrollView.xcworkspace/xcuserdata/CodeX.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.h b/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.h index 3a229bac..257ac56d 100644 --- a/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.h +++ b/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.h @@ -48,4 +48,7 @@ /** 只展示文字轮播 */ @property (nonatomic, assign) BOOL onlyDisplayText; +/** 标题是否在顶部显示 */ +@property (nonatomic, assign) BOOL showOnTop; + @end diff --git a/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.m b/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.m index 83f8ee06..fda4df6e 100644 --- a/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.m +++ b/SDCycleScrollView/Lib/SDCycleScrollView/SDCollectionViewCell.m @@ -108,7 +108,7 @@ - (void)layoutSubviews CGFloat titleLabelW = self.sd_width; CGFloat titleLabelH = _titleLabelHeight; CGFloat titleLabelX = 0; - CGFloat titleLabelY = self.sd_height - titleLabelH; + CGFloat titleLabelY = self.showOnTop ? 0 : self.sd_height - titleLabelH; _titleLabel.frame = CGRectMake(titleLabelX, titleLabelY, titleLabelW, titleLabelH); } } diff --git a/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.h b/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.h index 817b2f6a..266cf6a1 100644 --- a/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.h +++ b/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.h @@ -199,6 +199,9 @@ typedef enum { /** 滚动手势禁用(文字轮播较实用) */ - (void)disableScrollGesture; +/** 标题是否在顶部显示 */ +@property (nonatomic, assign) BOOL showOnTop; + ////////////////////// 清除缓存API ////////////////////// diff --git a/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.m b/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.m index 9ccd0ecd..2c466c91 100644 --- a/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.m +++ b/SDCycleScrollView/Lib/SDCycleScrollView/SDCycleScrollView.m @@ -569,7 +569,7 @@ - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSe - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { SDCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:ID forIndexPath:indexPath]; - + cell.showOnTop = self.showOnTop; long itemIndex = [self pageControlIndexWithCurrentCellIndex:indexPath.item]; if ([self.delegate respondsToSelector:@selector(setupCustomCell:forIndex:cycleScrollView:)] &&