From c09895184c2b54d2806255f36e7a9cc51ad49b81 Mon Sep 17 00:00:00 2001 From: chenjiantao Date: Wed, 9 Mar 2016 18:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AC=AC=E4=B8=83=E7=AB=A0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8ERN0.21=E7=89=88=E6=9C=AC=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CtripVersion/ReactVersion.h" | 2 +- .../CtripVersion/ReactVersion.m" | 34 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git "a/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.h" "b/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.h" index 6649e33..a3c7503 100644 --- "a/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.h" +++ "b/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.h" @@ -7,7 +7,7 @@ // #import -#import "RCTBridge.h" +#import "RCTBridge+Private.h" @interface ReactVersion : NSObject diff --git "a/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.m" "b/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.m" index 07e4f1a..95a32ea 100644 --- "a/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.m" +++ "b/\347\254\2547\347\253\240/version-component/CtripVersion/ReactVersion.m" @@ -67,26 +67,26 @@ - (void)dealloc #pragma mark JS Method RCT_EXPORT_METHOD(getCurrentJsVersion:(RCTPromiseResolveBlock)resolver - rejecter:(RCTPromiseRejectBlock)rejecter) + rejecter:(RCTPromiseRejectBlock)rejecter) { NSString *jsCodeVersion = [[NSUserDefaults standardUserDefaults] stringForKey:kCurrentReactJsCodeVersion] ?: __inAppVersion; if (jsCodeVersion) { resolver(jsCodeVersion); } else { - rejecter([NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can not get JS Version"]}]); + rejecter(@"500", @"Can not get JS Version", [NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can not get JS Version"]}]); } } RCT_EXPORT_METHOD(getRemoteVersion:(RCTPromiseResolveBlock)resolver - rejecter:(RCTPromiseRejectBlock)rejecter) + rejecter:(RCTPromiseRejectBlock)rejecter) { NSURLRequest *configRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://***/version.config"] cachePolicy:NSURLRequestReloadIgnoringLocalAndRemoteCacheData timeoutInterval:10]; NSURLSessionTask *configTask = [__URLSession dataTaskWithRequest:configRequest completionHandler:^(NSData * data, NSURLResponse * response, NSError * error) { if (error) { - rejecter(error); + rejecter(@"500", @"Download error:request version.config failure", error); return; } @try { @@ -95,7 +95,7 @@ - (void)dealloc NSDictionary *config= [NSJSONSerialization JSONObjectWithData:data options:0 error:&serilazationError]; if (serilazationError) { - rejecter(serilazationError); + rejecter(@"500", @"Convert NSData to JSON failure", serilazationError); return; } @@ -103,12 +103,12 @@ - (void)dealloc if (remoteJsVersion) { resolver(remoteJsVersion); } else { - rejecter([NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can not get JS Version"]}]); + rejecter(@"500", @"Can not get JS Version", [NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can not get JS Version"]}]); } } @catch (NSException *exception) { - rejecter([NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: exception.reason}]); + rejecter(@"500", exception.reason, [NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: exception.reason}]); } }]; @@ -117,8 +117,8 @@ - (void)dealloc RCT_EXPORT_METHOD(updateVersion:(NSDictionary *)config - resolver:(RCTPromiseResolveBlock)resolver - rejecter:(RCTPromiseRejectBlock)rejecter) + resolver:(RCTPromiseResolveBlock)resolver + rejecter:(RCTPromiseRejectBlock)rejecter) { @try { @@ -133,7 +133,7 @@ - (void)dealloc if (error || !location) { RCTLogWarn(@"Download error. %@",[error description]); - rejecter(error); + rejecter(@"500", [@"Download error! please check your server:%@" stringByAppendingString:request.URL.absoluteString], error); return; } @@ -146,21 +146,21 @@ - (void)dealloc RCTLogInfo(@"Update Js Code success"); resolver(remoteJsVersion); } else { - rejecter(ioError); + rejecter(@"500", [NSString stringWithFormat:@"Copies the item at the %@ to %@ failure", [location resourceSpecifier], [ReactVersion pathForVersion:remoteJsVersion]], ioError); } }]; [downloadTask resume]; } else { - rejecter([NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: @"don't need update"}]); + rejecter(@"500", @"don't need update", [NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: @"don't need update"}]); } } @catch (NSException *exception) { - rejecter([NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: exception.reason}]); + rejecter(@"500", exception.reason, [NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: exception.reason}]); } - + } @@ -178,13 +178,13 @@ - (void)dealloc } if (![[NSFileManager defaultManager] fileExistsAtPath:path]) { - rejecter([NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: @"no file exists"}]); + rejecter(@"500", @"no file exists", [NSError errorWithDomain:ErrorDomain code:(500) userInfo:@{NSLocalizedDescriptionKey: @"no file exists"}]); return; } - + self.bridge.bundleURL = [NSURL fileURLWithPath:path]; [self.bridge reload]; - + } #pragma -