更新第七章，与RN0.21版本同步

Author: JRJian

第7章/version-component/CtripVersion/ReactVersion.h

@@ -7,7 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "RCTBridge.h"
+#import "RCTBridge+Private.h"
 
 @interface ReactVersion : NSObject<RCTBridgeModule>
 

第7章/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,20 +95,20 @@ - (void)dealloc
             NSDictionary *config= [NSJSONSerialization JSONObjectWithData:data options:0 error:&serilazationError];
 
             if (serilazationError) {
-                rejecter(serilazationError);
+                rejecter(@"500", @"Convert NSData to JSON failure", serilazationError);
                 return;
             }
 
             NSString *remoteJsVersion = config[@"bundle_version"];
             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 -