You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/05/19 06:34:27 UTC

incubator-weex git commit: + [ios] update pretender logic

Repository: incubator-weex
Updated Branches:
  refs/heads/0.13-dev 1eefb4189 -> 8acc6e627


+ [ios] update pretender logic


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8acc6e62
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8acc6e62
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8acc6e62

Branch: refs/heads/0.13-dev
Commit: 8acc6e6278ff1be526aec8bbe018b2050d3b7672
Parents: 1eefb41
Author: 齐山 <su...@163.com>
Authored: Fri May 19 12:06:07 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Fri May 19 12:06:07 2017 +0800

----------------------------------------------------------------------
 ios/playground/WeexDemo/WXDemoViewController.m  |  6 ---
 .../Sources/Controller/WXBaseViewController.m   |  6 ---
 .../WeexSDK/Sources/Module/WXPrerenderManager.h |  3 +-
 .../WeexSDK/Sources/Module/WXPrerenderManager.m | 48 ++++++++++++--------
 4 files changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8acc6e62/ios/playground/WeexDemo/WXDemoViewController.m
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo/WXDemoViewController.m b/ios/playground/WeexDemo/WXDemoViewController.m
index 994ad0d..6673296 100644
--- a/ios/playground/WeexDemo/WXDemoViewController.m
+++ b/ios/playground/WeexDemo/WXDemoViewController.m
@@ -167,12 +167,6 @@
         WX_MONITOR_INSTANCE_PERF_END(WXPTJSDownload, _instance);
         WX_MONITOR_INSTANCE_PERF_START(WXPTFirstScreenRender, _instance);
         WX_MONITOR_INSTANCE_PERF_START(WXPTAllRender, _instance);
-        UIView *view = [WXPrerenderManager viewFromUrl:self.url.absoluteString];
-        _instance.onCreate(view);
-        NSError *error = [WXPrerenderManager errorFromUrl:self.url.absoluteString];
-        if(error){
-            _instance.onFailed(error);
-        }
         [WXPrerenderManager renderFromCache:[self.url absoluteString]];
         return;
     }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8acc6e62/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
index 5487109..225a153 100644
--- a/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
+++ b/ios/sdk/WeexSDK/Sources/Controller/WXBaseViewController.m
@@ -165,12 +165,6 @@
         WX_MONITOR_INSTANCE_PERF_END(WXPTJSDownload, _instance);
         WX_MONITOR_INSTANCE_PERF_START(WXPTFirstScreenRender, _instance);
         WX_MONITOR_INSTANCE_PERF_START(WXPTAllRender, _instance);
-        UIView *view = [WXPrerenderManager viewFromUrl:self.sourceURL.absoluteString];
-        _instance.onCreate(view);
-        NSError *error = [WXPrerenderManager errorFromUrl:self.sourceURL.absoluteString];
-        if(error){
-            _instance.onFailed(error);
-        }
         [WXPrerenderManager renderFromCache:[self.sourceURL absoluteString]];
         return;
     }

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8acc6e62/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 13de209..069d85e 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 WXInstance:(NSString *)instanceId callback:(WXModuleCallback)callback;
++ (void) addTask:(NSString *) url instanceId:(NSString *)instanceId callback:(WXModuleCallback)callback;
 
 /**
  *  @abstract Returns true if url is exist in task .
@@ -52,6 +52,7 @@
 
 /**
  *  @abstract excute render from prerender cache .
+ * @discussion this method should be excuted after oncreat and onfail block created
  *
  **/
 + (void) renderFromCache:(NSString *)url;

http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8acc6e62/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 8d123a7..f304240 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
@@ -85,7 +85,7 @@ static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
     self.prerenderTasks = nil;
 }
 
-+ (void) addTask:(NSString *)url WXInstance:(NSString *)instanceId callback:(WXModuleCallback)callback{
++ (void) addTask:(NSString *)url instanceId:(NSString *)instanceId callback:(WXModuleCallback)callback{
     NSURL *newUrl = [NSURL URLWithString:url];
     if(!newUrl){
         callback(@{@"url":url,@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"});
@@ -120,6 +120,7 @@ static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
     NSString *str = url.absoluteString;
     if(str.length==0){
         callback(@{@"url":[url absoluteString],@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"});
+        return;
     }
     WXPrerenderTask *task = [WXPrerenderTask new];
     id configCenter = [WXSDKEngine handlerForProtocol:@protocol(WXConfigCenterProtocol)];
@@ -148,28 +149,29 @@ static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
     task.parentInstanceId = instanceId;
     task.url = url.absoluteString;
     
-    if(!self.prerenderTasks || self.prerenderTasks.count<self.maxCacheNumber){
+    if(self.prerenderTasks && self.prerenderTasks.count<self.maxCacheNumber){
         [self.prerenderTasks setObject:task forKey:url.absoluteString];
         WXPerformBlockOnMainThread(^{
             [instance renderWithURL:url options:@{@"bundleUrl":url.absoluteString} data:nil];
+            WXPrerenderManager *manager = [WXPrerenderManager sharedInstance];
+            __weak typeof(self) weakSelf = manager;
+            instance.onCreate = ^(UIView *view) {
+                WXPrerenderTask *task = [weakSelf.prerenderTasks objectForKey:url.absoluteString];
+                task.view = view;
+                if(task){
+                    [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
+                }
+            };
+            
+            instance.onFailed = ^(NSError *error) {
+                WXPrerenderTask *task  = [weakSelf.prerenderTasks objectForKey:url.absoluteString];
+                task.error = error;
+                if(task){
+                    [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
+                }
+            };
         });
-        WXPrerenderManager *manager = [WXPrerenderManager sharedInstance];
-        __weak typeof(self) weakSelf = manager;
-        instance.onCreate = ^(UIView *view) {
-            WXPrerenderTask *task = [weakSelf.prerenderTasks objectForKey:url.absoluteString];
-            task.view = view;
-            if(task){
-                [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
-            }
-        };
         
-        instance.onFailed = ^(NSError *error) {
-            WXPrerenderTask *task  = [weakSelf.prerenderTasks objectForKey:url.absoluteString];
-            task.error = error;
-            if(task){
-                [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
-            }
-        };
     }
 }
 
@@ -201,13 +203,21 @@ static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
     return NO;
 }
 
-+ (void) renderFromCache:(NSString *)url
++ (void)renderFromCache:(NSString *)url
 {
     WXPrerenderManager *manager = [WXPrerenderManager sharedInstance];
     if([manager isTaskExist:url])
     {
         WXPrerenderTask *task  = [manager.prerenderTasks objectForKey:url];
         task.instance.needPrerender = NO;
+        UIView *view = [self viewFromUrl:url];
+        NSError *error = [self errorFromUrl:url];
+        if(task.instance.onCreate){
+            task.instance.onCreate(view);
+        }
+        if(error && task.instance.onFailed){
+            task.instance.onFailed(error);
+        }
         WXPerformBlockOnComponentThread(^{
             [task.instance.componentManager excutePrerenderUITask:url];
         });