重新定义API，完善淘宝和大众点评Demo

LeoMobileDeveloper · LeoMobileDeveloper · commit 9032be7f69be · 2016-07-15T15:18:13.000+08:00
diff --git a/PullToRefreshKit.podspec b/PullToRefreshKit.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'PullToRefreshKit'
-  s.version          = '0.1.1'
+  s.version          = '0.2.0'
   s.summary          = 'A refresh library written with pure Swift'
   s.description      = <<-DESC
 This is a pull to refresh library written by pure Swift. Using it you can add pull to refresh,pull to load more,pull left/right to view details within one line. Besides,it is quite easy to write a custom refresh view when using this lib.
diff --git a/PullToRefreshKit/DefaultTableViewController.swift b/PullToRefreshKit/DefaultTableViewController.swift
@@ -24,7 +24,11 @@ class DefaultTableViewController:UITableViewController{
             delay(1.5, closure: {
                 self?.models.append(random100())
                 self?.tableView.reloadData()
-                self?.tableView.endFooterRefreshing()
+                if self?.models.count < 15{
+                    self?.tableView.endFooterRefreshing()
+                }else{
+                    self?.tableView.endFooterRefreshingWithNoMoreData()
+                }
             })
         }
         self.tableView.beginHeaderRefreshing()
diff --git a/PullToRefreshKit/DianpingRefreshHeader.swift b/PullToRefreshKit/DianpingRefreshHeader.swift
@@ -9,7 +9,6 @@
 import Foundation
 import UIKit
 class DianpingRefreshHeader:UIView,RefreshableHeader{
- 
     let imageView = UIImageView()
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -25,28 +24,34 @@ class DianpingRefreshHeader:UIView,RefreshableHeader{
     func distanceToRefresh()->CGFloat{
         return 70
     }
-    func percentageChangedDuringDragging(percent:CGFloat){
-        imageView.hidden = false
+    //监听百分比变化
+    func percentUpdateWhenNotRefreshing(percent:CGFloat){
+        imageView.hidden = (percent == 0)
         let adjustPercent = max(min(1.0, percent),0.0)
         let scale = 0.2 + (1.0 - 0.2) * adjustPercent;
         imageView.transform = CGAffineTransformMakeScale(scale, scale)
         let mappedIndex = Int(adjustPercent * 60)
         let imageName = "dropdown_anim__000\(mappedIndex)"
-        print(imageName)
         let image = UIImage(named: imageName)
         imageView.image = image
     }
-    func willBeginRefreshing(){
+    //松手即将刷新的状态
+    func releaseWithRefreshingState(){
         let images = ["dropdown_loading_01","dropdown_loading_02","dropdown_loading_03"].map { (name) -> UIImage in
             return UIImage(named:name)!
         }
         imageView.animationImages = images
         imageView.animationDuration = 0.6
         imageView.startAnimating()
     }
-    func willEndRefreshing(result:RefreshResult){}
-    func didEndRefreshing(result:RefreshResult){
+    //刷新结束，将要隐藏header
+    func didBeginEndRefershingAnimation(result:RefreshResult){
+        
+    }
+    //刷新结束，完全隐藏header
+    func didCompleteEndRefershingAnimation(result:RefreshResult){
+        imageView.animationImages = nil
+        imageView.stopAnimating()
         imageView.hidden = true
     }
-    func didBeginRefreshing(){}
 }
diff --git a/PullToRefreshKit/DianpingTableviewController.swift b/PullToRefreshKit/DianpingTableviewController.swift
@@ -22,5 +22,6 @@ class DianpingTableviewController:CustomBaseTableViewController{
                 self?.tableView.endHeaderRefreshing(.Success)
             })
         }
+        self.tableView.beginHeaderRefreshing()
     }
 }
diff --git a/PullToRefreshKit/TaoBaoRefreshHeader.swift b/PullToRefreshKit/TaoBaoRefreshHeader.swift
@@ -68,10 +68,7 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
     func distanceToRefresh()->CGFloat{
         return 60
     }
-    func didBeginRefreshing(){
-        
-    }
-    func percentageChangedDuringDragging(percent:CGFloat){
+    func percentUpdateWhenNotRefreshing(percent:CGFloat){
         let adjustPercent = max(min(1.0, percent),0.0)
         self.circleLayer.strokeEnd = 0.05 + (0.95 - 0.05) * adjustPercent
         if adjustPercent  == 1.0{
@@ -80,7 +77,7 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
             textLabel.text = "下拉即可刷新..."
         }
     }
-    func willBeginRefreshing(){
+    func releaseWithRefreshingState(){
         self.circleLayer.strokeEnd = 0.95
         let rotateAnimation = CABasicAnimation(keyPath: "transform.rotation.z")
         rotateAnimation.toValue = NSNumber(double: M_PI * 2.0)
@@ -91,11 +88,11 @@ class TaoBaoRefreshHeader:UIView,RefreshableHeader{
         self.arrowLayer.hidden = true
         textLabel.text = "刷新中..."
     }
-    func willEndRefreshing(result:RefreshResult){
+    func didBeginEndRefershingAnimation(result:RefreshResult){
         self.circleLayer.strokeEnd = 0.05
         self.circleLayer.removeAllAnimations()
     }
-    func didEndRefreshing(result:RefreshResult){
+    func didCompleteEndRefershingAnimation(result:RefreshResult){
         self.circleLayer.strokeEnd = 0.05
         self.arrowLayer.hidden = false
         textLabel.text = "下拉即可刷新"
diff --git a/PullToRefreshKit/TaobaoTableViewController.swift b/PullToRefreshKit/TaobaoTableViewController.swift
@@ -21,5 +21,6 @@ class TaobaoTableViewController:CustomBaseTableViewController{
                 self?.tableView.endHeaderRefreshing(.Success)
             })
         }
+        self.tableView.beginHeaderRefreshing()
     }
 }
diff --git a/README.md b/README.md
@@ -16,6 +16,7 @@ self.tableView.setUpHeaderRefresh { [weak self] in
    })
 }
 ```
+这个库的设计初衷，是为了能够方便地实现自定义的下拉刷新，上拉加载等。比如，Demo中，我用了不到60行，就实现了大众点评的下拉刷新。实例代码：[DianpingRefreshHeader.swift](https://github.com/LeoMobileDeveloper/PullToRefreshKit/blob/master/PullToRefreshKit/DianpingRefreshHeader.swift)
 
 ## 要求
 
@@ -116,23 +117,26 @@ self.tableView.setUpHeaderRefresh { [weak self] in
 
 例如，Demo工程[TaoBaoRefreshHeader.swift](https://github.com/LeoMobileDeveloper/PullToRefreshKit/blob/master/PullToRefreshKit/TaoBaoRefreshHeader.swift)中实现了淘宝App的下拉刷新例子。
 
-你只需要根据协议提供的回调来更新时图的状态
+你只需要根据协议提供的回调来更新Header的状态
 
 这个协议提供的方法如下
 
 ```
-//触发刷新的距离，也是header的高度
+//触发刷新的距离，对于header/footer来讲，就是视图的高度；对于left/right来讲，就是视图的宽度
 func distanceToRefresh()->CGFloat
-//已经开始刷新的回调
-func didBeginRefreshing()
-//拖拽过程中，拖拽百分比的回调
-func percentageChangedDuringDragging(percent:CGFloat)
-//将要开始刷新
-func willBeginRefreshing()
-//将要结束刷新，result是刷新的结果,对应着界面header将要隐藏
-func willEndRefreshing(result:RefreshResult)
-//已经结束刷新，result是刷新的结果,对应着界面header完全隐藏
-func didEndRefreshing(result:RefreshResult)
+
+//百分比回调，在这里你根据百分比来动态的调整你的刷新视图
+func percentUpdateWhenNotRefreshing(percent:CGFloat)
+
+//松手就会刷新的回调,在这个回调里，将视图切换到动画的状态
+func releaseWithRefreshingState()
+
+//刷新结束，将要进行隐藏的动画，一般在这里告诉用户刷新的结果
+func didBeginEndRefershingAnimation(result:RefreshResult)
+
+//刷新结束，隐藏的动画结束，一般在这里把视图隐藏，各个参数恢复到最初状态
+func didCompleteEndRefershingAnimation(result:RefreshResult)
+    
 ```
 
 
diff --git a/Source/Classes/Header.swift b/Source/Classes/Header.swift
@@ -30,7 +30,7 @@ public class DefaultRefreshHeader:UIView,RefreshableHeader{
         addSubview(spinner)
         addSubview(textLabel)
         addSubview(imageView);
-        let image = UIImage(named: "arrow_down", inBundle: NSBundle(forClass: self.dynamicType), compatibleWithTraitCollection: nil)
+        let image = UIImage(named: "arrow_down", inBundle: NSBundle(forClass: DefaultRefreshHeader.self), compatibleWithTraitCollection: nil)
         imageView.image = image
         imageView.sizeToFit()
         imageView.frame = CGRectMake(0, 0, 24, 24)
@@ -60,7 +60,8 @@ public class DefaultRefreshHeader:UIView,RefreshableHeader{
     public func distanceToRefresh() -> CGFloat {
         return PullToRefreshKitConst.defaultHeaderHeight
     }
-    public func percentageChangedDuringDragging(percent:CGFloat){
+    public func percentUpdateWhenNotRefreshing(percent:CGFloat){
+        
         self.hidden = !(percent > 0.0)
         if percent > 1.0{
             textLabel.text = textDic[.releaseToRefresh]
@@ -81,7 +82,11 @@ public class DefaultRefreshHeader:UIView,RefreshableHeader{
             })
         }
     }
-    public func willEndRefreshing(result:RefreshResult) {
+    
+    public func percentageChangedDuringReleaseing(percent:CGFloat){
+    
+    }
+    public func didBeginEndRefershingAnimation(result:RefreshResult) {
         spinner.stopAnimating()
         imageView.transform = CGAffineTransformIdentity
         imageView.hidden = false
@@ -96,19 +101,16 @@ public class DefaultRefreshHeader:UIView,RefreshableHeader{
             textLabel.text = textDic[.pullToRefresh]
         }
     }
-    public func didEndRefreshing(result:RefreshResult) {
+    public func didCompleteEndRefershingAnimation(result:RefreshResult) {
         textLabel.text = textDic[.pullToRefresh]
         self.hidden = true
     }
-    public func willBeginRefreshing() {
+    public func releaseWithRefreshingState() {
         self.hidden = false
         textLabel.text = textDic[.refreshing]
         spinner.startAnimating()
         imageView.hidden = true
     }
-    public  func didBeginRefreshing() {
-        
-    }
 }
 
 public class RefreshHeaderContainer:UIView{
@@ -147,7 +149,7 @@ public class RefreshHeaderContainer:UIView{
                     self.attachedScrollView.contentInset = oldInset
                     
                     }, completion: { (finished) in
-                        self.delegate?.didEndRefreshing(self.currentResult)
+                        self.delegate?.didCompleteEndRefershingAnimation(self.currentResult)
                 })
             case .Refreshing:
                 dispatch_async(dispatch_get_main_queue(), {
@@ -158,9 +160,10 @@ public class RefreshHeaderContainer:UIView{
                         self.attachedScrollView.contentInset = oldInset
                         self.attachedScrollView.contentOffset = CGPointMake(0, -1.0 * top)
                         }, completion: { (finsihed) in
-                            self.delegate?.didBeginRefreshing()
                             self.refreshAction?()
                     })
+                    self.delegate?.percentUpdateWhenNotRefreshing(1.0)
+                    self.delegate?.releaseWithRefreshingState()
                 })
             default:
                 break
@@ -210,7 +213,7 @@ public class RefreshHeaderContainer:UIView{
     }
     func handleScrollOffSetChange(change: [String : AnyObject]?){
         if state == .Refreshing {
-//Refre from here https://github.com/CoderMJLee/MJRefresh/blob/master/MJRefresh/Base/MJRefreshHeader.m, thanks to this lib again
+//Refer from here https://github.com/CoderMJLee/MJRefresh/blob/master/MJRefresh/Base/MJRefreshHeader.m, thanks to this lib again
             guard self.window != nil else{
                 return
             }
@@ -231,16 +234,27 @@ public class RefreshHeaderContainer:UIView{
             return
         }
         let normal2pullingOffsetY = topShowOffsetY - self.frame.size.height
-        let percent = (topShowOffsetY - offSetY)/self.frame.size.height
         if attachedScrollView.dragging {
             if state == .Idle && offSetY < normal2pullingOffsetY {
                 self.state = .Pulling
             }else if state == .Pulling && offSetY >= normal2pullingOffsetY{
                 state = .Idle
             }
-            self.delegate?.percentageChangedDuringDragging(percent)
         }else if state == .Pulling{
             beginRefreshing()
+            return
+        }
+        let percent = (topShowOffsetY - offSetY)/self.frame.size.height
+        //防止在结束刷新的时候，percent的跳跃
+        if let oldOffset = change?[NSKeyValueChangeOldKey]?.CGPointValue(){
+            let oldPercent = (topShowOffsetY - oldOffset.y)/self.frame.size.height
+            if oldPercent >= 1.0 && percent == 0.0{
+                return
+            }else{
+                self.delegate?.percentUpdateWhenNotRefreshing(percent)
+            }
+        }else{
+            self.delegate?.percentUpdateWhenNotRefreshing(percent)
         }
     }
     // MARK: - KVO -
@@ -254,7 +268,6 @@ public class RefreshHeaderContainer:UIView{
     }
     // MARK: - API -
     func beginRefreshing(){
-        self.delegate?.willBeginRefreshing()
         if self.window != nil {
             self.state = .Refreshing
         }else{
@@ -264,7 +277,7 @@ public class RefreshHeaderContainer:UIView{
         }
     }
     func endRefreshing(result:RefreshResult){
-        self.delegate?.willEndRefreshing(result)
+        self.delegate?.didBeginEndRefershingAnimation(result)
         self.state = .Idle
     }
 }
diff --git a/Source/Classes/Left.swift b/Source/Classes/Left.swift
@@ -13,6 +13,7 @@ public enum RefreshKitLeftRightText{
     case scrollToAction
     case releaseToAction
 }
+
 public class DefaultRefreshLeft:UIView,RefreshableLeftRight{
     public let imageView:UIImageView = UIImageView()
     public let textLabel:UILabel  = UILabel().SetUp {
@@ -37,7 +38,7 @@ public class DefaultRefreshLeft:UIView,RefreshableLeftRight{
         textLabel.numberOfLines = 0
         imageView.frame = CGRectMake(0, 0,20, 20)
         imageView.center = CGPointMake(40,frame.size.height/2)
-        let image = UIImage(named: "arrow_right", inBundle: NSBundle(forClass: self.dynamicType), compatibleWithTraitCollection: nil)
+        let image = UIImage(named: "arrow_right", inBundle: NSBundle(forClass: DefaultRefreshLeft.self), compatibleWithTraitCollection: nil)
         imageView.image = image
         textDic[.scrollToAction] = PullToRefreshKitLeftString.scrollToAction
         textDic[.releaseToAction] = PullToRefreshKitLeftString.releaseToAction
@@ -51,7 +52,7 @@ public class DefaultRefreshLeft:UIView,RefreshableLeftRight{
    public func distanceToRefresh() -> CGFloat {
         return PullToRefreshKitConst.defaultHeaderHeight
     }
-   public func percentageChangedDuringDragging(percent:CGFloat){
+   public func percentUpdateWhenNotRefreshing(percent:CGFloat){
         if percent > 1.0{
             guard CGAffineTransformEqualToTransform(self.imageView.transform, CGAffineTransformIdentity)  else{
                 return
@@ -74,7 +75,7 @@ public class DefaultRefreshLeft:UIView,RefreshableLeftRight{
    public func didBeginRefreshing() {
 
     }
-   public func didEndRefreshing() {
+   public func didCompleteEndRefershingAnimation() {
         textLabel.text = textDic[.scrollToAction]
     }
 }
@@ -106,7 +107,7 @@ class RefreshLeftContainer:UIView{
                     self.delegate?.didBeginRefreshing()
                     self.refreshAction?()
                     self.endRefreshing()
-                    self.delegate?.didEndRefreshing()
+                    self.delegate?.didCompleteEndRefershingAnimation()
                 })
             default:
                 break
@@ -164,7 +165,7 @@ class RefreshLeftContainer:UIView{
         let normal2pullingOffsetX = topShowOffsetX - self.frame.size.width
         let percent = (topShowOffsetX - offSetX)/self.frame.size.width
         if attachedScrollView.dragging {
-            self.delegate?.percentageChangedDuringDragging(percent)
+            self.delegate?.percentUpdateWhenNotRefreshing(percent)
             if state == .Idle && offSetX < normal2pullingOffsetX {
                 self.state = .Pulling
             }else if state == .Pulling && offSetX >= normal2pullingOffsetX{
diff --git a/Source/Classes/PullToRefresh.swift b/Source/Classes/PullToRefresh.swift
diff --git a/Source/Classes/Right.swift b/Source/Classes/Right.swift

Original file line number	Diff line number	Diff line change
`@@ -22,5 +22,6 @@ class DianpingTableviewController:CustomBaseTableViewController{`
`22`	`22`	`self?.tableView.endHeaderRefreshing(.Success)`
`23`	`23`	`})`
`24`	`24`	`}`
	`25`	`+ self.tableView.beginHeaderRefreshing()`
`25`	`26`	`}`
`26`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@ class TaobaoTableViewController:CustomBaseTableViewController{`
`21`	`21`	`self?.tableView.endHeaderRefreshing(.Success)`
`22`	`22`	`})`
`23`	`23`	`}`
	`24`	`+ self.tableView.beginHeaderRefreshing()`
`24`	`25`	`}`
`25`	`26`	`}`