@@ -15,7 +15,7 @@ import UIKit
1515 @objc optional func cycleBannerViewDidLayoutItems( _ cycleBannerView: CycleBannerView )
1616}
1717
18- open class CycleBannerView : UIView , UIScrollViewDelegate , UIGestureRecognizerDelegate {
18+ open class CycleBannerView : UIView , UIScrollViewDelegate {
1919
2020 @IBOutlet weak var delegate : CycleBannerViewDelegate ?
2121
@@ -46,10 +46,7 @@ open class CycleBannerView: UIView, UIScrollViewDelegate, UIGestureRecognizerDel
4646 }
4747 }
4848 }
49- // // 所有显示的Items，
50- // // 如果cycleScrolling=false，则此属性与items值相同
51- // // 否则，此属性值比Items多两个，其中internalItems[0] == items.last，internalItems.last == items[0]，中间的都一样
52- // private var internalItems: [CycleBannerViewItem] = []
49+
5350 // items count
5451 public var numberOfItems : Int {
5552
@@ -65,26 +62,13 @@ open class CycleBannerView: UIView, UIScrollViewDelegate, UIGestureRecognizerDel
6562 public var itemFooterWidth : CGFloat = 0
6663
6764 // 自动滚动，小于0表示不自动滚动，否则每次按时间滚动一页，默认为0
68- public var autoplayDuration : Double = 0 {
69- didSet {
70- if autoplayDuration > 0
71- && numberOfItems > 0 {
72- startAutoplay ( )
73- } else {
74- stopAutoplay ( )
75- }
76- }
77- }
65+ public var autoplayDuration : Double = 0
7866
7967 // 是否循环滚动, 默认false
80- public var cycleScrolling : Bool = false {
81- didSet {
82-
83- }
84- }
68+ public var cycleScrolling : Bool = false
8569
8670 // select index
87- private ( set) var currentIndex : Int = 0
71+ fileprivate ( set) var currentIndex : Int = 0
8872
8973 public func setCurrentIndex( _ index: Int , animated: Bool ) {
9074 if index < 0
@@ -101,10 +85,6 @@ open class CycleBannerView: UIView, UIScrollViewDelegate, UIGestureRecognizerDel
10185 // scroll items
10286 private func _scrollToCurrentIndexItem_( _ animated: Bool ) {
10387
104- // if currentIndex == 0 {
105- //
106- // scrollView.setContentOffset(.zero, animated: animated)
107- // } else
10888 if let item = item ( at: currentIndex) {
10989
11090 let offsetX = item. center. x - scrollView. frame. width / 2.0
@@ -228,7 +208,6 @@ open class CycleBannerView: UIView, UIScrollViewDelegate, UIGestureRecognizerDel
228208 scrollView. addSubview ( item)
229209
230210 let tap = UITapGestureRecognizer ( target: self , action: #selector( _itemTapped_ ( sender: ) ) )
231- tap. delegate = self
232211 item. addGestureRecognizer ( tap)
233212 }
234213 }
@@ -253,14 +232,6 @@ open class CycleBannerView: UIView, UIScrollViewDelegate, UIGestureRecognizerDel
253232
254233 public func indexOfItem( at point: CGPoint ) -> Int ? {
255234
256- // // 第一个item的x
257- // var enumertatedItems: [CycleBannerViewItem] = items
258- // if (point.x < scrollView.contentSize.width - (scrollView.frame.width - itemSize.width) / 2.0 - itemFooterWidth
259- // && point.x > scrollView.contentSize.width / 2.0)
260- // || (point.x < (scrollView.frame.width - itemSize.width) / 2.0 - itemHeaderWidth){
261- // // 从最后一个开始遍历
262- // enumertatedItems = items.reversed()
263- // }
264235 for (index, item) in items. enumerated ( ) {
265236 if point. x < item. frame. maxX + itemFooterWidth
266237 && point. x > item. frame. minX - itemHeaderWidth {
@@ -323,10 +294,10 @@ open class CycleBannerView: UIView, UIScrollViewDelegate, UIGestureRecognizerDel
323294 delegate? . scrollViewDidScroll ? ( scrollView)
324295 }
325296
326- // MARK: UIGestureRecognizerDelegate
327- public func gestureRecognizer( _ gestureRecognizer: UIGestureRecognizer , shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer ) -> Bool {
328- return true
329- }
297+ // // MARK: UIGestureRecognizerDelegate
298+ // public func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
299+ // return true
300+ // }
330301
331302 // event
332303 @objc private func _itemTapped_( sender: UITapGestureRecognizer ? ) {
@@ -346,7 +317,8 @@ extension CycleBannerView {
346317 // 开始之前，先停止之前的操作
347318 stopAutoplay ( )
348319 // 时间小于0，不自动滚动
349- if autoplayDuration <= 0 {
320+ if autoplayDuration <= 0
321+ || numberOfItems == 0 {
350322 return
351323 }
352324 perform ( #selector( autoplayBanner) ,
@@ -360,6 +332,14 @@ extension CycleBannerView {
360332 object: nil )
361333 }
362334
335+ public func pauseAutoplay( ) {
336+ stopAutoplay ( )
337+ }
338+
339+ public func resumeAutoplay( ) {
340+ startAutoplay ( )
341+ }
342+
363343 @objc fileprivate func autoplayBanner( ) {
364344 var nextItemIndex = currentIndex + 1
365345 if cycleScrolling
@@ -384,11 +364,11 @@ extension CycleBannerView {
384364
385365 let contentMinX = ( scrollView. frame. width - itemSize. width) / 2.0 - itemHeaderWidth
386366 let contentMaxX = scrollView. contentSize. width - ( scrollView. frame. width - itemSize. width) / 2.0 + itemFooterWidth
387- if scrollView. contentOffset. x < contentMinX {
367+ if scrollView. contentOffset. x <= contentMinX {
388368 // 滑到了最左边，把最右边的item挪到最左边
389369 items [ 0 ] . center. x = scrollView. frame. width / 2.0
390370 items [ numberOfItems - 1 ] . center. x = contentMinX - itemFooterWidth - itemSize. width / 2.0
391- } else if scrollView. contentOffset. x > contentMaxX - scrollView. frame. width {
371+ } else if scrollView. contentOffset. x >= contentMaxX - scrollView. frame. width {
392372 // 滑到最右边，把最左边的item挪到最右边
393373 items [ numberOfItems - 1 ] . center. x = scrollView. contentSize. width - scrollView. frame. width / 2.0
394374 items [ 0 ] . center. x = contentMaxX + itemHeaderWidth + itemSize. width / 2.0
@@ -398,11 +378,15 @@ extension CycleBannerView {
398378 }
399379
400380 if scrollView. contentOffset. x <= - itemSize. width - itemHeaderWidth - itemFooterWidth {
401- // 循环滚动的时候，滑到最后一个item（此时最后一个item在第一个item的左边），则调回开头
381+ // 循环滚动的时候，滑到最左边item，此时最左边item.index=numberOfItems-1，则跳回到numberOfItems-1本来的位置
402382 scrollView. setContentOffset ( CGPoint ( x: scrollView. contentSize. width - scrollView. frame. width, y: 0 ) , animated: false )
383+ currentIndex = numberOfItems - 1
384+ pageControl. currentPage = currentIndex
403385 } else if scrollView. contentOffset. x >= scrollView. contentSize. width - scrollView. frame. width + itemSize. width + itemFooterWidth + itemHeaderWidth {
404- // 循环滚动的时候，滑到第一个item（此时第一个item在最后一个item的右边） ，则调回开头
386+ // 循环滚动的时候，滑到最右边item，此时最右边Item.index=0 ，则调回开头
405387 scrollView. setContentOffset ( . zero, animated: false )
388+ currentIndex = 0
389+ pageControl. currentPage = currentIndex
406390 }
407391 }
408392 }
0 commit comments