fix: 内容没有超过一个屏幕，触发footer的问题

eggswift · Jan 14, 2020 · c811c32 · c811c32 · yanmingLiu · Mar 9, 2021
1 parent 37d5a51
commit c811c32
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/ESPullToRefresh.podspec b/ESPullToRefresh.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |s|
     s.name              = 'ESPullToRefresh'
-    s.version           = '2.9.1'
+    s.version           = '2.9.2'
     s.summary           = 'An easy way to use pull-to-refresh and loading-more'
     s.description       = 'An easiest way to give pull-to-refresh and loading-more to any UIScrollView. Using swift!'
     s.homepage          = 'https://github.com/eggswift/pull-to-refresh'

diff --git a/ESPullToRefreshExample/ESPullToRefreshExample.xcodeproj/project.pbxproj b/ESPullToRefreshExample/ESPullToRefreshExample.xcodeproj/project.pbxproj
@@ -624,12 +624,12 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2.9.1;
+				CURRENT_PROJECT_VERSION = 2.9.2;
 				DEVELOPMENT_TEAM = A367N9R36B;
 				INFOPLIST_FILE = ESPullToRefreshExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eggswift.ESPullToRefreshExample11;
 				PRODUCT_NAME = Example;
 				SWIFT_VERSION = 5.0;
@@ -642,12 +642,12 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CURRENT_PROJECT_VERSION = 2.9.1;
+				CURRENT_PROJECT_VERSION = 2.9.2;
 				DEVELOPMENT_TEAM = A367N9R36B;
 				INFOPLIST_FILE = ESPullToRefreshExample/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 2.9.1;
+				MARKETING_VERSION = 2.9.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.eggswift.ESPullToRefreshExample11;
 				PRODUCT_NAME = Example;
 				SWIFT_VERSION = 5.0;

diff --git a/Sources/ESPullToRefresh.swift b/Sources/ESPullToRefresh.swift
@@ -321,6 +321,8 @@ open class ESRefreshHeaderView: ESRefreshComponent {
         self.animator.refreshAnimationEnd(view: self)
 
         // Back state
+        scrollView.contentInset.top = self.scrollViewInsets.top
+        scrollView.contentOffset.y =  self.previousOffset
         UIView.animate(withDuration: 0.2, delay: 0, options: .curveLinear, animations: {
             scrollView.contentOffset.y = -self.scrollViewInsets.top
             }, completion: { (finished) in