Merge pull request #1 from gaohaoyun/master

bugfix
BarredEwe · Feb 20, 2020 · fcbbaa8 · fcbbaa8
2 parents a7468d1 + feafcc9
commit fcbbaa8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/CRRefresh/CRRefresh/Animators/NormalAnimator/NormalFooterAnimator.swift b/CRRefresh/CRRefresh/Animators/NormalAnimator/NormalFooterAnimator.swift
@@ -88,6 +88,8 @@ open class NormalFooterAnimator: UIView, CRRefreshProtocol {
 
     open func refresh(view: CRRefreshComponent, stateDidChange state: CRRefreshState) {
         switch state {
+        case .idle:
+            titleLabel.text = loadingMoreDescription
         case .refreshing :
             titleLabel.text = loadingDescription
             break

diff --git a/CRRefresh/CRRefresh/CRRefreshHeaderView.swift b/CRRefresh/CRRefresh/CRRefreshHeaderView.swift
@@ -66,10 +66,16 @@ open class CRRefreshHeaderView: CRRefreshComponent {
         insets.top          += animator.execute
         insetTDelta          = -animator.execute
         holdInsetTDelta      = -(animator.execute - animator.hold)
-        UIView.animate(withDuration: CRRefreshComponent.animationDuration, animations: { 
+        var point = scrollView.contentOffset;
+        point.y = -insets.top
+        UIView.animate(withDuration: CRRefreshComponent.animationDuration, animations: {
+
             scrollView.contentOffset.y = self.previousOffsetY
             scrollView.contentInset    = insets
-            scrollView.contentOffset.y = -insets.top
+//            scrollView.contentOffset.y = -insets.top
+            scrollView.setContentOffset(point, animated: false);
+
+
         }) { (finished) in
             DispatchQueue.main.async {
                 self.handler?()

diff --git a/Demo/RefreshController.swift b/Demo/RefreshController.swift
@@ -78,10 +78,13 @@ class RefreshController: BaseViewController {
             print("开始加载")
             DispatchQueue.main.asyncAfter(deadline: .now() + 2, execute: {
                 self?.count += 10
-                self?.tableView.cr.noticeNoMoreData()
+                self?.tableView.cr.endLoadingMore()
                 self?.tableView.reloadData()
             })
         }
+
+        tableView.isPagingEnabled = true
+
     }
 
     //MARK: Override