You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/03/07 06:22:03 UTC
[14/19] incubator-weex git commit: * [ios] fix refresh and loading
* [ios] fix refresh and loading
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7320e4a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7320e4a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7320e4a3
Branch: refs/heads/0.11-dev
Commit: 7320e4a3e2a6ddd34e92a82b89cebb6a1194f2f7
Parents: e18f551
Author: acton393 <zh...@gmail.com>
Authored: Mon Mar 6 20:32:16 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Mon Mar 6 20:32:16 2017 +0800
----------------------------------------------------------------------
.../WeexSDK/Sources/Component/WXLoadingComponent.m | 13 -------------
.../WeexSDK/Sources/Component/WXRefreshComponent.m | 14 ++++++++++----
.../WeexSDK/Sources/Component/WXScrollerComponent.m | 15 +++++++++------
3 files changed, 19 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7320e4a3/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
index 88a75ae..fe8a660 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXLoadingComponent.m
@@ -70,19 +70,6 @@
if (!_displayState) {
[_indicator.view setHidden:YES];
}
- [self.view setFrame: (CGRect){
- .size = self.calculatedFrame.size,
- .origin.x = self.calculatedFrame.origin.x,
- .origin.y = self.view.frame.origin.y + CGRectGetHeight(self.calculatedFrame)
- }];
-}
-
-- (void)layoutDidFinish {
- [self.view setFrame: (CGRect){
- .size = self.calculatedFrame.size,
- .origin.x = self.calculatedFrame.origin.x,
- .origin.y = self.view.frame.origin.y + CGRectGetHeight(self.calculatedFrame)
- }];
}
- (void)addEvent:(NSString *)eventName
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7320e4a3/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
index c60bbe5..f519a4f 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXRefreshComponent.m
@@ -48,14 +48,19 @@
- (void)viewDidLoad
{
_initFinished = YES;
+
+ if (!_displayState) {
+ [_indicator.view setHidden:YES];
+ }
+}
+
+- (void)layoutDidFinish
+{
[self.view setFrame: (CGRect) {
.size = self.calculatedFrame.size,
.origin.x = self.calculatedFrame.origin.x,
.origin.y = self.view.frame.origin.y - CGRectGetHeight(self.calculatedFrame)
}];
- if (!_displayState) {
- [_indicator.view setHidden:YES];
- }
}
- (void)viewWillUnload
@@ -137,10 +142,11 @@
offset.y = -self.calculatedFrame.size.height;
[_indicator start];
} else {
- offset.y = 0;
+ offset.y += CGRectGetHeight(self.calculatedFrame);
[_indicator stop];
}
[scrollerProtocol setContentOffset:offset animated:YES];
+
}
- (BOOL)displayState
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7320e4a3/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 0e40c88..37c34c8 100644
--- a/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXScrollerComponent.m
@@ -465,12 +465,15 @@ WX_EXPORT_METHOD(@selector(resetLoadmore))
- (void)scrollViewDidEndScrollingAnimation:(UIScrollView *)scrollView
{
UIEdgeInsets inset = [scrollView contentInset];
- if ([_refreshComponent displayState]) {
- inset.top = _refreshComponent.view.frame.size.height;
- }
- else {
- inset.top = 0;
- }
+
+ // currently only set contentInset when loading
+ // if ([_refreshComponent displayState]) {
+ // inset.top = _refreshComponent.view.frame.size.height;
+ // }
+ // else {
+ // inset.top = 0;
+ // }
+
if ([_loadingComponent displayState]) {
inset.bottom = _loadingComponent.view.frame.size.height;
} else {