You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/02/28 02:30:24 UTC
[44/50] incubator-weex git commit: * [ios] bugfix pulling down event
* [ios] bugfix pulling down event
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e7a8b7e3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e7a8b7e3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e7a8b7e3
Branch: refs/heads/0.11-dev
Commit: e7a8b7e30c4beb4c41c5cb7b51353abdca01460c
Parents: 22d8039
Author: acton393 <zh...@gmail.com>
Authored: Fri Feb 24 19:14:14 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri Feb 24 19:14:14 2017 +0800
----------------------------------------------------------------------
.../Sources/Component/WXRefreshComponent.h | 6 +++---
.../Sources/Component/WXScrollerComponent.m | 19 +++++++++++--------
2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7a8b7e3/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
index 73bddd3..6256f21 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
+++ b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.h
@@ -8,9 +8,9 @@
#import "WXComponent.h"
-#define REFRESH_DISTANCE_Y @"dy"
-#define REFRESH_HEADERHEIGHT @"headerHeight"
-#define REFRESH_MAXHEIGHT @"maxHeight"
+#define REFRESH_DISTANCE_Y @"dy"
+#define REFRESH_PULLINGDISTANCE @"pullingDistance"
+#define REFRESH_VIEWHEIGHT @"viewHeight"
@interface WXRefreshComponent : WXComponent
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e7a8b7e3/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
index c4f2999..d0bef9b 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -424,15 +424,18 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
} else if(_lastContentOffset.y < scrollView.contentOffset.y) {
_direction = @"up";
}
- CGFloat scaleFactor = self.weexInstance.pixelScaleFactor;
- [_refreshComponent pullingdown:@{
- REFRESH_DISTANCE_Y: @(fabs(scrollView.contentOffset.y/scaleFactor)),
- REFRESH_MAXHEIGHT: @(_refreshComponent.view.frame.size.height/scaleFactor),
- REFRESH_HEADERHEIGHT: @(_refreshComponent.view.frame.size.height/scaleFactor),
- @"type":@"pullingdown"
- }];
-
+
_lastContentOffset = scrollView.contentOffset;
+
+ CGFloat scaleFactor = self.weexInstance.pixelScaleFactor;
+ if ([_refreshComponent displayState] && scrollView.dragging) {
+ [_refreshComponent pullingdown:@{
+ REFRESH_DISTANCE_Y: @(fabs((scrollView.contentOffset.y - _lastContentOffset.y)/scaleFactor)),
+ REFRESH_VIEWHEIGHT: @(_refreshComponent.view.frame.size.height/scaleFactor),
+ REFRESH_PULLINGDISTANCE: @(scrollView.contentOffset.y/scaleFactor),
+ @"type":@"pullingdown"
+ }];
+ }
// check sticky
[self adjustSticky];