1.0.21

修复： 1. iOS刷新修改 2. 安卓刷新修改 3. 在onScroll的时候才改变进度条透明度 4. scrollTo原生端修改成setContentOffset 5. 原声编译版本修改为28 6. 支持tvOS

Author: ATShiTou

src/SpringScrollView.js

@@ -290,7 +290,10 @@ export class SpringScrollView extends React.PureComponent<SpringScrollViewPropTy
  };
 
  _onKeyboardWillHide = () => {
- this._keyboardHeight > 0 && this.scroll({ x: 0, y: -this._keyboardHeight });
+ if (this._keyboardHeight > 0) {
+ this.scroll({ x: 0, y: -this._keyboardHeight });
+ this._keyboardHeight = 0;
+ }
  };
 
  _beginIndicatorDismissAnimation() {
@@ -306,6 +309,7 @@ export class SpringScrollView extends React.PureComponent<SpringScrollViewPropTy
  if (!finished) {
  this._indicatorOpacity.setValue(1);
  }
+ this._indicatorAnimation = null;
  });
  }
 
@@ -325,6 +329,9 @@ export class SpringScrollView extends React.PureComponent<SpringScrollViewPropTy
  this.props.onLoading && loadingStatus === "loading" && this.props.onLoading();
  }
  this.props.onScroll && this.props.onScroll(e);
+ if (!this._indicatorAnimation) {
+ this._indicatorOpacity.setValue(1);
+ }
  };
 
  _toRefreshStatus(status: HeaderStatus) {
@@ -493,8 +500,6 @@ export class SpringScrollView extends React.PureComponent<SpringScrollViewPropTy
  _onTouchBegin = () => {
  if (TextInputState.currentlyFocusedField())
  TextInputState.blurTextInput(TextInputState.currentlyFocusedField());
- this._indicatorAnimation && this._indicatorAnimation.stop();
- this._indicatorOpacity.setValue(1);
  this.props.tapToHideKeyboard && Keyboard.dismiss();
  this.props.onTouchBegin && this.props.onTouchBegin();
  };

src/android/build.gradle

@@ -1,3 +1,6 @@
+def safeExtGet(prop, fallback) {
+ rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
 
 buildscript {
  repositories {
@@ -12,13 +15,12 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
- compileSdkVersion 26
+ compileSdkVersion safeExtGet('compileSdkVersion', 26)
+ publishNonDefault true
 
  defaultConfig {
- minSdkVersion 16
- targetSdkVersion 26
- versionCode 1
- versionName "1.0"
+ minSdkVersion safeExtGet('minSdkVersion', 16)
+ targetSdkVersion safeExtGet('targetSdkVersion', 26)
  }
  lintOptions {
  abortOnError false

src/android/src/main/java/com/bolan9999/DecelerateAnimation.java

@@ -58,12 +58,13 @@ public void onAnimationRepeat(Animator animation) {
  }
 
  public boolean cancel() {
- boolean cancel=this.animating;
+ boolean cancel = this.animating;
  animator.cancel();
  return cancel;
  }
 
- protected abstract void onEnd();
+ protected void onEnd() {
+ }
 
  protected abstract void onUpdate(float value);
 }

src/android/src/main/java/com/bolan9999/SpringScrollView.java

@@ -522,12 +522,9 @@ private void sendEvent(String evtName, WritableMap event) {
  public void endRefresh() {
  if (!refreshStatus.equals("refreshing")) return;
  refreshStatus = "rebound";
+ if (verticalAnimation != null) verticalAnimation.cancel();
+ contentInsets.top = 0;
  verticalAnimation = new DecelerateAnimation(contentOffset.y, 0, 500) {
- @Override
- protected void onEnd() {
- contentInsets.top = 0;
- }
-
  @Override
  protected void onUpdate(float value) {
  setContentOffset(contentOffset.x, value);
@@ -539,12 +536,9 @@ protected void onUpdate(float value) {
  public void endLoading() {
  if (!loadingStatus.equals("loading")) return;
  loadingStatus = "rebound";
+ if (verticalAnimation != null) verticalAnimation.cancel();
+ contentInsets.bottom = 0;
  verticalAnimation = new DecelerateAnimation(contentOffset.y, contentSize.height - size.height, 500) {
- @Override
- protected void onEnd() {
- contentInsets.bottom = 0;
- }
-
  @Override
  protected void onUpdate(float value) {
  setContentOffset(contentOffset.x, value);

src/ios/SpringScrollView/STSpringScrollView.m

@@ -11,10 +11,9 @@
 @interface STSpringScrollView ()
 @property(nonatomic, assign) float refreshHeaderHeight;
 @property(nonatomic, assign) float loadingFooterHeight;
-@property(nonatomic, assign) UIEdgeInsets orgInsets;
+//@property(nonatomic, assign) UIEdgeInsets orgInsets;
 @property(nonatomic, copy) NSString *refreshStatus;
 @property(nonatomic, copy) NSString *loadingStatus;
-@property(nonatomic, assign) BOOL orgScrollEnabled;
 @property(nonatomic, copy) NSDictionary *initialContentOffset;
 @property(nonatomic, assign) BOOL allLoaded;
 @property(nonatomic, assign) BOOL initialed;
@@ -53,16 +52,17 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL
  [super scrollViewDidEndDragging:scrollView willDecelerate:decelerate];
  if ([self shouldRefresh]) {
  self.refreshStatus = @"refreshing";
- self.orgInsets = self.scrollView.contentInset;
- [self.scrollView setContentInset:UIEdgeInsetsMake(self.orgInsets.top+self.refreshHeaderHeight, self.orgInsets.left, self.orgInsets.bottom, self.orgInsets.right)];
+ [self.scrollView setContentInset:UIEdgeInsetsMake(self.refreshHeaderHeight, 0, 0, 0)];
  } else if ([self shouldLoad]) {
  self.loadingStatus = @"loading";
- self.orgInsets = self.scrollView.contentInset;
  CGFloat fill = .0f;
  if(self.scrollView.frame.size.height>self.scrollView.contentSize.height){
  fill=self.scrollView.frame.size.height-self.scrollView.contentSize.height;
  }
- [self.scrollView setContentInset:UIEdgeInsetsMake(self.orgInsets.top, self.orgInsets.left, self.orgInsets.bottom+self.loadingFooterHeight+fill, self.orgInsets.right)];
+ [self.scrollView setContentInset:UIEdgeInsetsMake(0, 0, self.loadingFooterHeight+fill, 0)];
+ }
+ else if ([self hitRefreshStatus:@[@"rebound"]] && !UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, scrollView.contentInset)){
+ [self.scrollView setContentOffset:CGPointMake(0, 0) animated:YES];
  }
 }
 
@@ -75,6 +75,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
  self.refreshStatus = @"pullingCancel";
  } else if ([self shouldWaiting]){
  self.refreshStatus = @"waiting";
+ scrollView.contentInset = UIEdgeInsetsZero;
  }
  if ([self shouldDragging]) {
  self.loadingStatus = @"dragging";
@@ -84,21 +85,15 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
  self.loadingStatus = @"draggingCancel";
  } else if ([self shouldFooterWaiting]) {
  self.loadingStatus = @"waiting";
+ scrollView.contentInset = UIEdgeInsetsZero;
  }
  [super scrollViewDidScroll:scrollView];
 }
 
-- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView{
- if (!UIEdgeInsetsEqualToEdgeInsets(scrollView.contentInset, self.orgInsets) && ([self hitRefreshStatus:@[@"waiting"]] || [self hitLoadingStatus:@[@"waiting"]])) {
- scrollView.contentInset = self.orgInsets;
- }
-}
-
 - (void)endRefresh {
  if ([self hitRefreshStatus:@[@"refreshing"]]) {
  self.refreshStatus = @"rebound";
- [self.scrollView setContentOffset:CGPointMake(0, 0) animated:YES];
- self.orgScrollEnabled = self.scrollView.scrollEnabled;
+ [self.scrollView setContentOffset:CGPointMake(self.scrollView.contentOffset.x, 0) animated:YES];
  }
 }
 
@@ -126,7 +121,7 @@ - (BOOL) shouldPullingCancel{
 }
 
 - (BOOL) shouldWaiting{
- return self.refreshHeaderHeight>0 && ([self hitRefreshStatus:@[@"rebound",@"pullingCancel"]]) && self.scrollView.contentOffset.y >=0;
+ return self.refreshHeaderHeight>0 && ([self hitRefreshStatus:@[@"rebound",@"pullingCancel"]]) && !UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, self.scrollView.contentInset) && self.scrollView.contentOffset.y >=0;
 }
 
 - (BOOL) shouldDragging{
@@ -207,8 +202,8 @@ - (void)scrollToOffset:(CGPoint)offset animated:(BOOL)animated{
 
 - (void)setAllLoaded:(BOOL)allLoaded{
  self.loadingStatus = allLoaded?@"allLoaded":@"waiting";
- if (allLoaded && !UIEdgeInsetsEqualToEdgeInsets(self.orgInsets, self.scrollView.contentInset)) {
- [self.scrollView setContentInset:self.orgInsets];
+ if (allLoaded && !UIEdgeInsetsEqualToEdgeInsets(UIEdgeInsetsZero, self.scrollView.contentInset)) {
+ [self.scrollView setContentInset:UIEdgeInsetsZero];
  }
  [self sendScrollEventWithName:@"onScroll" scrollView:self.scrollView userData:@{}];
 }

src/package.json

@@ -1,6 +1,6 @@
 {
  "name": "react-native-spring-scrollview",
- "version": "2.0.20",
+ "version": "2.0.21",
  "description": "An cross-platform (iOS & Android) spring ScrollView",
  "main": "index.js",
  "scripts": {