From c811c322f5eaab82379950284f2dd3d58c636dd8 Mon Sep 17 00:00:00 2001 From: jinjiahui Date: Tue, 14 Jan 2020 16:32:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E8=B6=85=E8=BF=87=E4=B8=80=E4=B8=AA=E5=B1=8F=E5=B9=95=EF=BC=8C?= =?UTF-8?q?=E8=A7=A6=E5=8F=91footer=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ESPullToRefresh.podspec | 2 +- .../ESPullToRefreshExample.xcodeproj/project.pbxproj | 8 ++++---- Sources/ESPullToRefresh.swift | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ESPullToRefresh.podspec b/ESPullToRefresh.podspec index 47ffa51..47c3c94 100755 --- 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 index 504e8a9..ad9f4c4 100644 --- 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 index 91136b8..e430beb 100644 --- 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