Repository: incubator-weex Updated Branches: refs/heads/master a553c194a -> 9f2676b21
* [iOS] bugfix about waterfall component and compile warnnings Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/9f2676b2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/9f2676b2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/9f2676b2 Branch: refs/heads/master Commit: 9f2676b219f7ac1192556716b9d9d42808d60ba9 Parents: a553c19 Author: acton393 <[email protected]> Authored: Sun Feb 25 10:19:38 2018 +0800 Committer: acton393 <[email protected]> Committed: Sun Feb 25 10:19:38 2018 +0800 ---------------------------------------------------------------------- .../Component/Recycler/WXRecyclerUpdateController.m | 3 --- ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h | 4 ++-- ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m | 16 ++++++++-------- 3 files changed, 10 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f2676b2/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m index 4630d58..7435c8d 100644 --- a/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m +++ b/ios/sdk/WeexSDK/Sources/Component/Recycler/WXRecyclerUpdateController.m @@ -162,9 +162,6 @@ if (!self.delegate || !collectionView.dataSource) { return; } - if (![diffResult hasChanges]) { - return; - } WXLogDebug(@"Diff result:%@", diffResult); [collectionView performBatchUpdates:updates completion:completion]; } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f2676b2/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h index 62e83e9..3f04e46 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h +++ b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h @@ -36,7 +36,7 @@ * @param callback the module method callback * **/ -+ (void) addTask:(NSString *) url instanceId:(NSString *)instanceId callback:(WXModuleCallback)callback; ++ (void) addTask:(NSString *) url instanceId:(NSString *)instanceId callback:(WXModuleKeepAliveCallback)callback; /** * @abstract add prerender task @@ -46,7 +46,7 @@ * @param callback the module method callback * **/ -+ (void) addGlobalTask:(NSString *) url callback:(WXModuleCallback)callback; ++ (void) addGlobalTask:(NSString *) url callback:(WXModuleKeepAliveCallback)callback; /** * @abstract Returns true if url is exist in task . http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/9f2676b2/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m ---------------------------------------------------------------------- diff --git a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m index 2f61925..2002d95 100644 --- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m +++ b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m @@ -87,11 +87,11 @@ static NSString *const MSG_PRERENDER_SUCCESS = @"success"; self.prerenderTasks = nil; } -+ (void) addTask:(NSString *)url instanceId:(NSString *)instanceId callback:(WXModuleCallback)callback{ ++ (void) addTask:(NSString *)url instanceId:(NSString *)instanceId callback:(WXModuleKeepAliveCallback)callback{ NSURL *newUrl = [NSURL URLWithString:url]; if(!newUrl){ if(callback){ - callback(@{@"url":url,@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}); + callback(@{@"url":url,@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}, NO); } return; } @@ -103,12 +103,12 @@ static NSString *const MSG_PRERENDER_SUCCESS = @"success"; }); } -+ (void) addGlobalTask:(NSString *) url callback:(WXModuleCallback)callback ++ (void) addGlobalTask:(NSString *) url callback:(WXModuleKeepAliveCallback)callback { NSURL *newUrl = [NSURL URLWithString:url]; if(!newUrl){ if(callback){ - callback(@{@"url":url,@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}); + callback(@{@"url":url,@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}, NO); } return; } @@ -136,12 +136,12 @@ static NSString *const MSG_PRERENDER_SUCCESS = @"success"; return YES; } -- (void) prerender:(NSURL *)url instanceId:(NSString *)instanceId isCache:(BOOL)isCache callback:(WXModuleCallback) callback{ +- (void) prerender:(NSURL *)url instanceId:(NSString *)instanceId isCache:(BOOL)isCache callback:(WXModuleKeepAliveCallback) callback{ NSString *str = url.absoluteString; if(str.length==0){ if(callback){ - callback(@{@"url":[url absoluteString],@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}); + callback(@{@"url":[url absoluteString],@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}, NO); } return; } @@ -149,7 +149,7 @@ static NSString *const MSG_PRERENDER_SUCCESS = @"success"; id configCenter = [WXSDKEngine handlerForProtocol:@protocol(WXConfigCenterProtocol)]; if(![self isSwitchOn]){ if(callback){ - callback(@{@"url":[url absoluteString],@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}); + callback(@{@"url":[url absoluteString],@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"}, NO); } return; } @@ -197,7 +197,7 @@ static NSString *const MSG_PRERENDER_SUCCESS = @"success"; [instance renderWithURL:url options:@{@"bundleUrl":url.absoluteString} data:nil]; }); if(callback){ - callback(@{@"url":url.absoluteString,@"message":MSG_PRERENDER_SUCCESS,@"result":@"success"}); + callback(@{@"url":url.absoluteString,@"message":MSG_PRERENDER_SUCCESS,@"result":@"success"}, NO); } } }
