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/25 08:38:44 UTC
[06/22] incubator-weex git commit: * [ios] add jsdownload finish
callback
* [ios] add jsdownload finish callback
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b2f79013
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b2f79013
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b2f79013
Branch: refs/heads/0.14-dev
Commit: b2f79013d6249a88ec3d1caf91a8810162818cb9
Parents: 0394268
Author: acton393 <zh...@gmail.com>
Authored: Wed May 24 22:02:24 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Wed May 24 22:02:24 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h | 9 ++++++++-
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 14 +++++++++++---
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2f79013/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
index 4f63e35..abfdc9d 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.h
@@ -20,7 +20,8 @@
#import <UIKit/UIKit.h>
#import "WXComponent.h"
#import "WXJSExceptionInfo.h"
-@class WXResourceRequest;
+#import "WXResourceResponse.h"
+#import "WXResourceRequest.h"
extern NSString *const bundleUrlOptionKey;
@@ -153,6 +154,12 @@ typedef NS_ENUM(NSInteger, WXErrorCode) {//error.code
@property (nonatomic, copy) void (^onRenderProgress)(CGRect renderRect);
/**
+ * The callback triggered when the bundleJS request finished in the renderWithURL.
+ * @return A block that takes response which the server response,request which send to server,data which the server returned and an error
+ */
+@property (nonatomic, copy) void(^onJSDownloadedFinish)(WXResourceResponse *response,WXResourceRequest *request,NSData *data, NSError* error);
+
+/**
* the frame of current instance.
**/
@property (nonatomic, assign) CGRect frame;
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b2f79013/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
index 68eb1d2..8401067 100644
--- a/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
+++ b/ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m
@@ -245,7 +245,7 @@ typedef enum : NSUInteger {
_mainBundleLoader = [[WXResourceLoader alloc] initWithRequest:request];;
_mainBundleLoader.onFinished = ^(WXResourceResponse *response, NSData *data) {
__strong typeof(weakSelf) strongSelf = weakSelf;
-
+ NSError *error = nil;
if ([response isKindOfClass:[NSHTTPURLResponse class]] && ((NSHTTPURLResponse *)response).statusCode != 200) {
NSError *error = [NSError errorWithDomain:WX_ERROR_DOMAIN
code:((NSHTTPURLResponse *)response).statusCode
@@ -253,7 +253,15 @@ typedef enum : NSUInteger {
if (strongSelf.onFailed) {
strongSelf.onFailed(error);
}
- return ;
+ }
+
+ if (strongSelf.onJSDownloadedFinish) {
+ strongSelf.onJSDownloadedFinish(response, request, data, error);
+ }
+
+ if (error) {
+ // if an error occurs, just return.
+ return;
}
if (!data) {
@@ -274,7 +282,7 @@ typedef enum : NSUInteger {
WX_MONITOR_SUCCESS_ON_PAGE(WXMTJSDownload, strongSelf.pageName);
WX_MONITOR_INSTANCE_PERF_END(WXPTJSDownload, strongSelf);
-
+
[strongSelf _renderWithMainBundleString:jsBundleString];
};