完善Container逻辑，支持header额外区域配置，完善淘宝Demo

LeoMobileDeveloper · LeoMobileDeveloper · commit fd4f9189ab7d · 2016-07-20T15:08:52.000+08:00
diff --git a/PullToRefreshKit.xcodeproj/project.pbxproj b/PullToRefreshKit.xcodeproj/project.pbxproj
@@ -29,6 +29,7 @@
 		52BB29321D364E490091F36B /* DefaultTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BB29311D364E490091F36B /* DefaultTableViewController.swift */; };
 		52BB29341D3655B90091F36B /* Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52BB29331D3655B90091F36B /* Util.swift */; };
 		52C0E4881D3726EB00618231 /* ConfigBannerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52C0E4871D3726EB00618231 /* ConfigBannerController.swift */; };
+		52D61D701D3F56A900A5B4E0 /* taobaoLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 52D61D6F1D3F56A900A5B4E0 /* taobaoLogo.png */; };
 		52E8FB401D336E26000D0BF1 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E8FB3F1D336E26000D0BF1 /* AppDelegate.swift */; };
 		52E8FB421D336E26000D0BF1 /* MainViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52E8FB411D336E26000D0BF1 /* MainViewController.swift */; };
 		52E8FB451D336E26000D0BF1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52E8FB431D336E26000D0BF1 /* Main.storyboard */; };
@@ -64,6 +65,7 @@
 		52BB29311D364E490091F36B /* DefaultTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DefaultTableViewController.swift; sourceTree = "<group>"; };
 		52BB29331D3655B90091F36B /* Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Util.swift; sourceTree = "<group>"; };
 		52C0E4871D3726EB00618231 /* ConfigBannerController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfigBannerController.swift; sourceTree = "<group>"; };
+		52D61D6F1D3F56A900A5B4E0 /* taobaoLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = taobaoLogo.png; sourceTree = "<group>"; };
 		52E8FB3C1D336E26000D0BF1 /* PullToRefreshKit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PullToRefreshKit.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		52E8FB3F1D336E26000D0BF1 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		52E8FB411D336E26000D0BF1 /* MainViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainViewController.swift; sourceTree = "<group>"; };
@@ -203,6 +205,7 @@
 		52FA97A71D3888660021D77F /* taobao */ = {
 			isa = PBXGroup;
 			children = (
+				52D61D6F1D3F56A900A5B4E0 /* taobaoLogo.png */,
 				5238C7D21D37427C00B3B4FE /* TaoBaoRefreshHeader.swift */,
 				5238C7D41D37449800B3B4FE /* TaobaoTableViewController.swift */,
 			);
@@ -278,6 +281,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				5238C8091D3763CD00B3B4FE /* arrow_right@3x.png in Resources */,
+				52D61D701D3F56A900A5B4E0 /* taobaoLogo.png in Resources */,
 				52261F111D36878A00161ADF /* banner2.jpg in Resources */,
 				52F50E391D3E3E3800A9AB83 /* PullToRefreshkit.strings in Resources */,
 				5238C8071D3763CD00B3B4FE /* arrow_down@3x.png in Resources */,
diff --git a/PullToRefreshKit/ConfigBannerController.swift b/PullToRefreshKit/ConfigBannerController.swift
@@ -54,7 +54,7 @@ class ConfigBannerController: UIViewController {
             label.frame = CGRectMake(0, 0, screenWidth, 40)
             label.font = UIFont.systemFontOfSize(14)
             label.center  = CGPointMake(scrollView.center.x, scrollView.center.y - CGRectGetWidth(scrollView.frame)/2 - 20)
-            label.text = "向左或者向右滑动Banner"
+            label.text = "向左或向右滑动Banner"
             label.textAlignment = .Center
         }
         view.addSubview(desLabel)
diff --git a/PullToRefreshKit/DefaultBannerController.swift b/PullToRefreshKit/DefaultBannerController.swift
@@ -45,7 +45,7 @@ class DefaultBannerController: UIViewController {
             label.frame = CGRectMake(0, 0, screenWidth, 40)
             label.font = UIFont.systemFontOfSize(14)
             label.center  = CGPointMake(scrollView.center.x, scrollView.center.y - CGRectGetWidth(scrollView.frame)/2 - 20)
-            label.text = "向左或者向右滑动Banner"
+            label.text = "向左或向右滑动Banner"
             label.textAlignment = .Center
         }
         view.addSubview(desLabel)
diff --git a/PullToRefreshKit/DianpingRefreshHeader.swift b/PullToRefreshKit/DianpingRefreshHeader.swift
@@ -41,7 +41,7 @@ class DianpingRefreshHeader:UIView,RefreshableHeader{
             return UIImage(named:name)!
         }
         imageView.animationImages = images
-        imageView.animationDuration = 0.6
+        imageView.animationDuration = Double(images.count) * 0.15
         imageView.startAnimating()
     }
     //刷新结束，将要隐藏header
diff --git a/PullToRefreshKit/TaoBaoRefreshHeader.swift b/PullToRefreshKit/TaoBaoRefreshHeader.swift
@@ -9,6 +9,7 @@
 import Foundation
 import UIKit
 
+
 class TaoBaoRefreshHeader:UIView,RefreshableHeader{
     private let circleLayer = CAShapeLayer()
     private let arrowLayer = CAShapeLayer()
@@ -18,12 +19,20 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
         super.init(frame: frame)
         setUpCircleLayer()
         setUpArrowLayer()
-        textLabel.frame = CGRectMake(CGRectGetWidth(self.bounds)/2 - 30, CGRectGetHeight(self.bounds)/2 - 20,120, 40)
+        textLabel.frame = CGRectMake(0,0,120, 40)
         textLabel.textAlignment = .Center
         textLabel.textColor = UIColor.lightGrayColor()
         textLabel.font = UIFont.systemFontOfSize(14)
         textLabel.text = "下拉即可刷新..."
+        let imageView = UIImageView(frame: CGRectMake(0, 0, 230, 35))
+        imageView.image = UIImage(named: "taobaoLogo")
+        self.addSubview(imageView)
         self.addSubview(textLabel)
+        //放置Views和Layer
+        imageView.center = CGPointMake(CGRectGetWidth(frame)/2, CGRectGetHeight(frame) - 60 - 18)
+        textLabel.center = CGPointMake(CGRectGetWidth(frame)/2 + 20, CGRectGetHeight(frame) - 30)
+        self.arrowLayer.position = CGPointMake(CGRectGetWidth(frame)/2 - 60, CGRectGetHeight(frame) - 30)
+        self.circleLayer.position = CGPointMake(CGRectGetWidth(frame)/2 - 60, CGRectGetHeight(frame) - 30)
     }
     func setUpArrowLayer(){
         let bezierPath = UIBezierPath()
@@ -38,7 +47,6 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
         self.arrowLayer.lineWidth = 1.0
         self.arrowLayer.lineCap = kCALineCapRound
         self.arrowLayer.bounds = CGRectMake(0, 0,40, 40)
-        self.arrowLayer.position = CGPointMake(CGRectGetWidth(self.bounds)/2.0 - 60, CGRectGetHeight(self.bounds)/2.0)
         self.arrowLayer.anchorPoint = CGPointMake(0.5, 0.5)
         self.layer.addSublayer(self.arrowLayer)
     }
@@ -56,7 +64,6 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
         self.circleLayer.lineWidth = 1.0
         self.circleLayer.lineCap = kCALineCapRound
         self.circleLayer.bounds = CGRectMake(0, 0,40, 40)
-        self.circleLayer.position = CGPointMake(CGRectGetWidth(self.bounds)/2.0 - 60, CGRectGetHeight(self.bounds)/2.0)
         self.circleLayer.anchorPoint = CGPointMake(0.5, 0.5)
         self.layer.addSublayer(self.circleLayer)
     }
@@ -70,7 +77,9 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
     }
     func percentUpdateWhenNotRefreshing(percent:CGFloat){
         let adjustPercent = max(min(1.0, percent),0.0)
-        self.circleLayer.strokeEnd = 0.05 + (0.95 - 0.05) * adjustPercent
+        transitionWithOutAnimation {
+            self.circleLayer.strokeEnd = 0.05 + (0.95 - 0.05) * adjustPercent
+        };
         if adjustPercent  == 1.0{
             textLabel.text = "释放即可刷新..."
         }else{
@@ -89,12 +98,22 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
         textLabel.text = "刷新中..."
     }
     func didBeginEndRefershingAnimation(result:RefreshResult){
-        self.circleLayer.strokeEnd = 0.05
+        transitionWithOutAnimation {
+            self.circleLayer.strokeEnd = 0.05
+        };
         self.circleLayer.removeAllAnimations()
     }
     func didCompleteEndRefershingAnimation(result:RefreshResult){
-        self.circleLayer.strokeEnd = 0.05
+        transitionWithOutAnimation { 
+            self.circleLayer.strokeEnd = 0.05
+        };
         self.arrowLayer.hidden = false
         textLabel.text = "下拉即可刷新"
     }
+    func transitionWithOutAnimation(clousre:()->()){
+        CATransaction.begin()
+        CATransaction.setDisableActions(true)
+        clousre()
+        CATransaction.commit()
+    }
 }
diff --git a/PullToRefreshKit/TaobaoTableViewController.swift b/PullToRefreshKit/TaobaoTableViewController.swift
@@ -12,8 +12,8 @@ class TaobaoTableViewController:CustomBaseTableViewController{
     override func viewDidLoad() {
         super.viewDidLoad()
         //Setup
-        self.tableView.backgroundColor = UIColor(red: 232.0/255.0, green: 234.0/255.0, blue: 235.0/255.0, alpha: 1.0)
-        let taobaoHeader = TaoBaoRefreshHeader(frame: CGRectMake(0,0,CGRectGetWidth(self.view.bounds),60))
+//        self.tableView.backgroundColor = UIColor(red: 232.0/255.0, green: 234.0/255.0, blue: 235.0/255.0, alpha: 1.0)
+        let taobaoHeader = TaoBaoRefreshHeader(frame: CGRectMake(0,0,CGRectGetWidth(self.view.bounds),100))
         self.tableView.setUpHeaderRefresh(taobaoHeader) { [weak self] in
             delay(1.5, closure: {
                 self?.models = (self?.models.map({_ in random100()}))!
diff --git a/PullToRefreshKit/taobaoLogo.png b/PullToRefreshKit/taobaoLogo.png
diff --git a/Source/Classes/Const.swift b/Source/Classes/Const.swift
@@ -43,7 +43,7 @@ struct PullToRefreshKitFooterString{
     static let refreshing = "正在加载中..."
     static let noMoreData = "数据加载完毕"
     static let tapToRefresh = "点击加载更多"
-    static let scrollAndTapToRefresh = "上拉或者点击加载更多"
+    static let scrollAndTapToRefresh = "上拉或点击加载更多"
 }
 
 struct PullToRefreshKitLeftString{
diff --git a/Source/Classes/Footer.swift b/Source/Classes/Footer.swift
@@ -18,17 +18,21 @@ public enum RefreshKitFooterText{
 }
 
 public enum RefreshMode{
+    /// 只有Scroll才会触发
     case Scroll
+    /// 只有Tap才会触发
     case Tap
+    /// Scroll和Tap都会触发
     case ScrollAndTap
 }
+
 public class DefaultRefreshFooter:UIView,RefreshableFooter{
     public let spinner:UIActivityIndicatorView = UIActivityIndicatorView(activityIndicatorStyle: .Gray)
     public  let textLabel:UILabel = UILabel(frame: CGRectMake(0,0,140,40)).SetUp {
         $0.font = UIFont.systemFontOfSize(14)
         $0.textAlignment = .Center
     }
-    /// 是否需要点击来触发刷新,如果需要点击，则在上拉的时候，不会触发刷新
+    /// 触发刷新的模式
     public var refreshMode = RefreshMode.ScrollAndTap{
         didSet{
             tap.enabled = (refreshMode != .Scroll)
diff --git a/Source/Classes/Header.swift b/Source/Classes/Header.swift
@@ -152,8 +152,9 @@ public class RefreshHeaderContainer:UIView{
                 })
             case .Refreshing:
                 dispatch_async(dispatch_get_main_queue(), {
+                    let fireHeight = (self.delegate?.distanceToRefresh())!
                     UIView.animateWithDuration(0.4, animations: {
-                        let top = (self.originalInset?.top)! + CGRectGetHeight(self.frame)
+                        let top = (self.originalInset?.top)! + fireHeight
                         var oldInset = self.attachedScrollView.contentInset
                         oldInset.top = top
                         self.attachedScrollView.contentInset = oldInset
@@ -211,6 +212,7 @@ public class RefreshHeaderContainer:UIView{
         attachedScrollView?.removeObserver(self, forKeyPath: PullToRefreshKitConst.KPathOffSet,context: nil)
     }
     func handleScrollOffSetChange(change: [String : AnyObject]?){
+        let fireHeight = (self.delegate?.distanceToRefresh())!
         if state == .Refreshing {
 //Refer from here https://github.com/CoderMJLee/MJRefresh/blob/master/MJRefresh/Base/MJRefreshHeader.m, thanks to this lib again
             guard self.window != nil else{
@@ -219,7 +221,7 @@ public class RefreshHeaderContainer:UIView{
             let offset = attachedScrollView.contentOffset
             let inset = originalInset!
             var insetT = -1 * offset.y > inset.top ? (-1 * offset.y):inset.top
-            insetT = insetT > CGRectGetHeight(self.frame) + inset.top ? CGRectGetHeight(self.frame) + inset.top:insetT
+            insetT = insetT > fireHeight + inset.top ? fireHeight + inset.top:insetT
             var oldInset = attachedScrollView.contentInset
             oldInset.top = insetT
             attachedScrollView.contentInset = oldInset
@@ -232,7 +234,7 @@ public class RefreshHeaderContainer:UIView{
         guard offSetY <= topShowOffsetY else{
             return
         }
-        let normal2pullingOffsetY = topShowOffsetY - self.frame.size.height
+        let normal2pullingOffsetY = topShowOffsetY - fireHeight
         if attachedScrollView.dragging {
             if state == .Idle && offSetY < normal2pullingOffsetY {
                 self.state = .Pulling
@@ -243,10 +245,10 @@ public class RefreshHeaderContainer:UIView{
             beginRefreshing()
             return
         }
-        let percent = (topShowOffsetY - offSetY)/self.frame.size.height
+        let percent = (topShowOffsetY - offSetY)/fireHeight
         //防止在结束刷新的时候，percent的跳跃
         if let oldOffset = change?[NSKeyValueChangeOldKey]?.CGPointValue(){
-            let oldPercent = (topShowOffsetY - oldOffset.y)/self.frame.size.height
+            let oldPercent = (topShowOffsetY - oldOffset.y)/fireHeight
             if oldPercent >= 1.0 && percent == 0.0{
                 return
             }else{
diff --git a/Source/Classes/PullToRefresh.swift b/Source/Classes/PullToRefresh.swift
@@ -29,7 +29,7 @@ public enum RefreshResult{
 }
 public protocol RefreshableHeader:class{
     /**
-     触发动作的距离，对于header/footer来讲，就是视图的高度；对于left/right来讲，就是视图的宽度
+     触发动作的距离，注意，这个距离决定了在刷新状态显示header的视图的大小，这个距离要小于frame.height
      */
     func distanceToRefresh()->CGFloat
     
@@ -127,16 +127,17 @@ public extension UIScrollView{
     public  func setUpHeaderRefresh<T:UIView where T:RefreshableHeader>(header:T,action:()->())->T{
         let oldContain = self.viewWithTag(PullToRefreshKitConst.headerTag)
         oldContain?.removeFromSuperview()
-        let height = header.distanceToRefresh()
-        let frame = CGRectMake(0,-1 * height,CGRectGetWidth(self.frame),height)
-        let containComponent = RefreshHeaderContainer(frame: frame)
+        
+        let containFrame = CGRectMake(0, -CGRectGetHeight(self.frame), CGRectGetWidth(self.frame), CGRectGetHeight(self.frame))
+        let containComponent = RefreshHeaderContainer(frame: containFrame)
         containComponent.tag = PullToRefreshKitConst.headerTag
         containComponent.refreshAction = action
         self.addSubview(containComponent)
         
         containComponent.delegate = header
         header.autoresizingMask = [.FlexibleWidth,.FlexibleHeight]
-        header.frame = containComponent.bounds
+        let bounds = CGRectMake(0,CGRectGetHeight(containFrame) - CGRectGetHeight(header.frame),CGRectGetWidth(self.frame),CGRectGetHeight(header.frame))
+        header.frame = bounds
         containComponent.addSubview(header)
         return header
     }

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ class ConfigBannerController: UIViewController {`
`54`	`54`	`label.frame = CGRectMake(0, 0, screenWidth, 40)`
`55`	`55`	`label.font = UIFont.systemFontOfSize(14)`
`56`	`56`	`label.center = CGPointMake(scrollView.center.x, scrollView.center.y - CGRectGetWidth(scrollView.frame)/2 - 20)`
`57`		`- label.text = "向左或者向右滑动Banner"`
	`57`	`+ label.text = "向左或向右滑动Banner"`
`58`	`58`	`label.textAlignment = .Center`
`59`	`59`	`}`
`60`	`60`	`view.addSubview(desLabel)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class DefaultBannerController: UIViewController {`
`45`	`45`	`label.frame = CGRectMake(0, 0, screenWidth, 40)`
`46`	`46`	`label.font = UIFont.systemFontOfSize(14)`
`47`	`47`	`label.center = CGPointMake(scrollView.center.x, scrollView.center.y - CGRectGetWidth(scrollView.frame)/2 - 20)`
`48`		`- label.text = "向左或者向右滑动Banner"`
	`48`	`+ label.text = "向左或向右滑动Banner"`
`49`	`49`	`label.textAlignment = .Center`
`50`	`50`	`}`
`51`	`51`	`view.addSubview(desLabel)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class DianpingRefreshHeader:UIView,RefreshableHeader{`
`41`	`41`	`return UIImage(named:name)!`
`42`	`42`	`}`
`43`	`43`	`imageView.animationImages = images`
`44`		`- imageView.animationDuration = 0.6`
	`44`	`+ imageView.animationDuration = Double(images.count) * 0.15`
`45`	`45`	`imageView.startAnimating()`
`46`	`46`	`}`
`47`	`47`	`//刷新结束，将要隐藏header`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ struct PullToRefreshKitFooterString{`
`43`	`43`	`static let refreshing = "正在加载中..."`
`44`	`44`	`static let noMoreData = "数据加载完毕"`
`45`	`45`	`static let tapToRefresh = "点击加载更多"`
`46`		`- static let scrollAndTapToRefresh = "上拉或者点击加载更多"`
	`46`	`+ static let scrollAndTapToRefresh = "上拉或点击加载更多"`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`struct PullToRefreshKitLeftString{`