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/05/16 03:18:21 UTC
[11/12] incubator-weex git commit: + [ios] add comment for function
and move prerender module
+ [ios] add comment for function and move prerender module
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/7256aee6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/7256aee6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/7256aee6
Branch: refs/heads/0.13-dev
Commit: 7256aee693cd2cd73fa5dd0169a47efea8d539d4
Parents: b23500b
Author: 齐山 <su...@163.com>
Authored: Tue May 16 09:54:16 2017 +0800
Committer: 齐山 <su...@163.com>
Committed: Tue May 16 09:54:16 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 8 ---
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 -
.../WeexSDK/Sources/Module/WXPrerenderManager.h | 65 ++++++++++++++++----
.../WeexSDK/Sources/Module/WXPrerenderManager.m | 22 ++++---
.../WeexSDK/Sources/Module/WXPrerenderModule.h | 25 --------
.../WeexSDK/Sources/Module/WXPrerenderModule.m | 56 -----------------
6 files changed, 66 insertions(+), 111 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7256aee6/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
index 7da0da4..5d9f7bc 100644
--- a/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
+++ b/ios/sdk/WeexSDK.xcodeproj/project.pbxproj
@@ -239,8 +239,6 @@
C41E1A981DC1FD15009C7F90 /* WXDatePickerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C41E1A961DC1FD15009C7F90 /* WXDatePickerManager.m */; };
C43C03E81EC8ACA40044C7FF /* WXPrerenderManager.h in Headers */ = {isa = PBXBuildFile; fileRef = C43C03E41EC8ACA40044C7FF /* WXPrerenderManager.h */; };
C43C03E91EC8ACA40044C7FF /* WXPrerenderManager.m in Sources */ = {isa = PBXBuildFile; fileRef = C43C03E51EC8ACA40044C7FF /* WXPrerenderManager.m */; };
- C43C03EA1EC8ACA40044C7FF /* WXPrerenderModule.h in Headers */ = {isa = PBXBuildFile; fileRef = C43C03E61EC8ACA40044C7FF /* WXPrerenderModule.h */; };
- C43C03EB1EC8ACA40044C7FF /* WXPrerenderModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C43C03E71EC8ACA40044C7FF /* WXPrerenderModule.m */; };
C4B3D6D41E6954300013F38D /* WXEditComponent.h in Headers */ = {isa = PBXBuildFile; fileRef = C4B3D6D21E6954300013F38D /* WXEditComponent.h */; };
C4B3D6D51E6954300013F38D /* WXEditComponent.m in Sources */ = {isa = PBXBuildFile; fileRef = C4B3D6D31E6954300013F38D /* WXEditComponent.m */; };
C4B834271DE69B09007AD27E /* WXPickerModule.m in Sources */ = {isa = PBXBuildFile; fileRef = C4B834251DE69B09007AD27E /* WXPickerModule.m */; };
@@ -559,8 +557,6 @@
C41E1A961DC1FD15009C7F90 /* WXDatePickerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXDatePickerManager.m; sourceTree = "<group>"; };
C43C03E41EC8ACA40044C7FF /* WXPrerenderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXPrerenderManager.h; sourceTree = "<group>"; };
C43C03E51EC8ACA40044C7FF /* WXPrerenderManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXPrerenderManager.m; sourceTree = "<group>"; };
- C43C03E61EC8ACA40044C7FF /* WXPrerenderModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXPrerenderModule.h; sourceTree = "<group>"; };
- C43C03E71EC8ACA40044C7FF /* WXPrerenderModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXPrerenderModule.m; sourceTree = "<group>"; };
C4B3D6D21E6954300013F38D /* WXEditComponent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXEditComponent.h; sourceTree = "<group>"; };
C4B3D6D31E6954300013F38D /* WXEditComponent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXEditComponent.m; sourceTree = "<group>"; };
C4B834251DE69B09007AD27E /* WXPickerModule.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WXPickerModule.m; sourceTree = "<group>"; };
@@ -1068,8 +1064,6 @@
children = (
C43C03E41EC8ACA40044C7FF /* WXPrerenderManager.h */,
C43C03E51EC8ACA40044C7FF /* WXPrerenderManager.m */,
- C43C03E61EC8ACA40044C7FF /* WXPrerenderModule.h */,
- C43C03E71EC8ACA40044C7FF /* WXPrerenderModule.m */,
C4F012801E1502E9003378D0 /* WXWebSocketModule.h */,
C4F012811E1502E9003378D0 /* WXWebSocketModule.m */,
C4B834251DE69B09007AD27E /* WXPickerModule.m */,
@@ -1351,7 +1345,6 @@
D334510C1D3E19B80083598A /* WXCanvasModule.h in Headers */,
742AD73A1DF98C8B007DC46C /* WXResourceLoader.h in Headers */,
746319291C71B92600EFEBD4 /* WXModalUIModule.h in Headers */,
- C43C03EA1EC8ACA40044C7FF /* WXPrerenderModule.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1584,7 +1577,6 @@
D312CE3C1C730DEB00046D68 /* WXWebComponent.m in Sources */,
74AD99851D5B0E59008F0336 /* WXPolyfillSet.m in Sources */,
D317338D1C57257000BB7539 /* WXTransform.m in Sources */,
- C43C03EB1EC8ACA40044C7FF /* WXPrerenderModule.m in Sources */,
7461F8A91CFC33A800F62D44 /* WXThreadSafeMutableArray.m in Sources */,
745B2D6D1E5A8E1E0092D38A /* WXRecyclerDataController.m in Sources */,
2AC750251C7565690041D390 /* WXIndicatorComponent.m in Sources */,
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7256aee6/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
index 7e3c6a3..96434b1 100644
--- a/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
+++ b/ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m
@@ -60,7 +60,6 @@
[self registerModule:@"picker" withClass:NSClassFromString(@"WXPickerModule")];
[self registerModule:@"meta" withClass:NSClassFromString(@"WXMetaModule")];
[self registerModule:@"webSocket" withClass:NSClassFromString(@"WXWebSocketModule")];
- [self registerModule:@"prerender" withClass:NSClassFromString(@"WXPrerenderModule")];
}
+ (void)registerModule:(NSString *)name withClass:(Class)clazz
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7256aee6/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 b6a9d0b..8617557 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h
+++ b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.h
@@ -21,29 +21,68 @@
#import <WeexSDk/WeexSDK.h>
@class WXModuleMethod;
-typedef NS_ENUM(NSUInteger, PrerenderStatus) {
- PrerenderSucceed = 0,
- PrerenderFail = 1,
-};
-typedef NS_ENUM(NSUInteger, PrerenderTaskType) {
- PrerenderUITaskType = 0,
- PrerenderMethodType = 1,
-};
-
-typedef void (^PrerenderCallback) (PrerenderStatus status, NSString* urlStr, NSString * msg);
@interface WXPrerenderManager : NSObject
- (instancetype) init NS_UNAVAILABLE;
-+ (instancetype) sharedInstance;
-+ (void) addTask:(NSString *) urlStr WXInstance:(NSString *) instanceId callback:(WXModuleCallback)callback;
+
+/**
+ * @abstract add prerender task
+ *
+ * @param url The prerender url string
+ *
+ * @param instanceId The instanceId that its instance add prerender task
+ *
+ * @param callback the module method callback
+ *
+ **/
++ (void) addTask:(NSString *) url WXInstance:(NSString *)instanceId callback:(WXModuleCallback)callback;
+
+/**
+ * @abstract Returns true if url is exist in task .
+ *
+ **/
+ (BOOL) isTaskExist:(NSString *)url;
+
+/**
+ * @abstract Returns error if url is prerender fail .
+ *
+ **/
+ (NSError *)errorFromUrl:(NSString *)url;
+
+/**
+ * @abstract excute render from prerender cache .
+ *
+ **/
+ (void) renderFromCache:(NSString *)url;
+
+/**
+ * @abstract Returns prerender root view .
+ *
+ **/
+ (UIView *)viewFromUrl:(NSString *)url;
+
+/**
+ * @abstract Returns prerender instance .
+ *
+ **/
+ (id)instanceFromUrl:(NSString *)url;
+
+/**
+ * @abstract Remove prerender task by url .
+ *
+ **/
+ (void)removePrerenderTaskforUrl:(NSString *)url;
+
+/**
+ * @abstract store prerender module task by url .
+ *
+ **/
+ (void)storePrerenderModuleTasks:(WXModuleMethod *)prerenderModuleTask forUrl:(NSString *)url;
-+ (void)excuteModuleTasksForUrl:(NSString *)url;
+
+/**
+ * @abstract destroy task , it will destroy instance also.
+ *
+ **/
+ (void)destroyTask:(NSString *)parentInstanceId;
@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7256aee6/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 9ce22b5..18ebf44 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderManager.m
@@ -83,17 +83,17 @@ static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
self.prerenderTasks = nil;
}
-+ (void) addTask:(NSString *)urlStr WXInstance:(NSString *)instanceId callback:(WXModuleCallback)callback{
- NSURL *url = [NSURL URLWithString:urlStr];
- if(!url){
- callback(@{@"url":urlStr,@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"});
++ (void) addTask:(NSString *)url WXInstance:(NSString *)instanceId callback:(WXModuleCallback)callback{
+ NSURL *newUrl = [NSURL URLWithString:url];
+ if(!newUrl){
+ callback(@{@"url":url,@"message":MSG_PRERENDER_INTERNAL_ERROR,@"result":@"error"});
return;
}
WXPrerenderManager *manager = [WXPrerenderManager sharedInstance];
__weak WXPrerenderManager *weakSelf = manager;
dispatch_async(manager.queue, ^{
- [weakSelf prerender:url WXInstance:instanceId callback:callback];
+ [weakSelf prerender:newUrl WXInstance:instanceId callback:callback];
});
}
@@ -156,13 +156,17 @@ static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
instance.onCreate = ^(UIView *view) {
WXPrerenderTask *task = [weakSelf.prerenderTasks objectForKey:url.absoluteString];
task.view = view;
- [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
+ if(task){
+ [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
+ }
};
instance.onFailed = ^(NSError *error) {
WXPrerenderTask *task = [weakSelf.prerenderTasks objectForKey:url.absoluteString];
task.error = error;
- [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
+ if(task){
+ [weakSelf.prerenderTasks setObject:task forKey:url.absoluteString];
+ }
};
}
}
@@ -245,7 +249,9 @@ static NSString *const MSG_PRERENDER_INTERNAL_ERROR = @"internal_error";
task.moduleTasks = [NSMutableArray new];
}
[task.moduleTasks addObject:method];
- [manager.prerenderTasks setObject:task forKey:url];
+ if(task){
+ [manager.prerenderTasks setObject:task forKey:url];
+ }
}
+ (void)excuteModuleTasksForUrl:(NSString *)url
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7256aee6/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.h b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.h
deleted file mode 100644
index 19ed65a..0000000
--- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-#import <Foundation/Foundation.h>
-#import <WeexSDK/WXModuleProtocol.h>
-
-@interface WXPrerenderModule : NSObject <WXModuleProtocol>
-
-@end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/7256aee6/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.m b/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.m
deleted file mode 100644
index ec3c462..0000000
--- a/ios/sdk/WeexSDK/Sources/Module/WXPrerenderModule.m
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-#import "WXPrerenderModule.h"
-#import "WXPrerenderManager.h"
-
-@interface WXPrerenderModule()
-
-@property (nonatomic, strong) NSString *instanceId;
-
-@end
-
-@implementation WXPrerenderModule
-
-@synthesize weexInstance;
-
-WX_EXPORT_METHOD(@selector(addTask:callback:))
-
-- (void)dealloc {
- if(!_instanceId){
- return;
- }
-
-}
-
-- (void) addTask:(NSString *) urlStr callback:(WXModuleCallback)callback{
- if(![self weexInstance]){
- return;
- }
-
- NSURL *sourceURL = [NSURL URLWithString:urlStr];
- if (!sourceURL) {
- return;
- }
-
- _instanceId = [[self weexInstance] instanceId];
-
- [WXPrerenderManager addTask:urlStr WXInstance:[self.weexInstance instanceId] callback:callback];
-}
-
-@end