From 36781d7942a85abb8996bdfd9febce9f11501318 Mon Sep 17 00:00:00 2001 From: Manloff Date: Tue, 5 Mar 2019 18:29:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20"=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=9C=A8=E9=A1=B6=E9=83=A8=E6=98=BE=E7=A4=BA?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xcschemes/xcschememanagement.plist | 19 ++++++++++++++++++ .../xcschemes/xcschememanagement.plist | 14 +++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../UserInterfaceState.xcuserstate | Bin 0 -> 12473 bytes .../SDCycleScrollView/SDCollectionViewCell.h | 3 +++ .../SDCycleScrollView/SDCollectionViewCell.m | 2 +- .../Lib/SDCycleScrollView/SDCycleScrollView.h | 3 +++ .../Lib/SDCycleScrollView/SDCycleScrollView.m | 2 +- 8 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 Pods/Pods.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 SDCycleScrollView.xcodeproj/xcuserdata/CodeX.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 SDCycleScrollView.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 SDCycleScrollView.xcworkspace/xcuserdata/CodeX.xcuserdatad/UserInterfaceState.xcuserstate 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 0000000000000000000000000000000000000000..29cd43c151e1d3e1084199e22900433aa16eb4a3 GIT binary patch literal 12473 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 S>p>emsDqvv05(wCw*LW#dW|Ch literal 0 HcmV?d00001 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:)] &&