Merge pull request #7 from Elric-pp/feat/finapplet-init

fix: finApplet init

Author: sybarisdev

ios/FINMopsdk.m

@@ -19,23 +19,25 @@ @implementation FINMopsdk
     FATConfig *config = [FATConfig configWithAppSecret:secret appKey:appkey];
     config.apiServer = [apiServer copy];
     config.apiPrefix = [apiPrefix copy];
-    NSError* error = nil;
-    [[FATClient sharedClient] initWithConfig:config error:&error];
-    NSDictionary* ret;
-    if (error) {
+    dispatch_async(dispatch_get_main_queue(), ^(void) {
+        NSError* error = nil;
+        [[FATClient sharedClient] initWithConfig:config error:&error];
+        NSDictionary* ret;
+        if (error) {
+            ret = @{
+                @"success": @(NO),
+                @"errMsg": [NSString stringWithFormat:@"初始化小程序引擎失败%@",error.localizedDescription]
+            };
+            callback(@[[ret toJSONString]]);
+            return;
+        }
+        
         ret = @{
-            @"success": @(NO),
-            @"errMsg": [NSString stringWithFormat:@"初始化小程序引擎失败%@",error.localizedDescription]
+            @"success": @(YES),
+            @"errMsg": @"initialize:ok"
         };
         callback(@[[ret toJSONString]]);
-        return;
-    }
-    
-    ret = @{
-        @"success": @(YES),
-        @"errMsg": @"initialize:ok"
-    };
-    callback(@[[ret toJSONString]]);
+    });
 }
 RCT_EXPORT_METHOD(openApplet:(nonnull NSString *)appId path:(NSString *)path query:(NSString*)query sequence:(NSString*)sequence callback:(RCTResponseSenderBlock)callback)
 {
@@ -49,43 +51,23 @@ @implementation FINMopsdk
     // 打开小程序
     dispatch_async(dispatch_get_main_queue(), ^{
         UIViewController *currentVC = [MOPTools topViewController];
-        if (sequence == nil) {
-            [[FATClient sharedClient] startRemoteApplet:appId startParams:params InParentViewController:currentVC completion:^(BOOL result, NSError *error) {
-                NSLog(@"result:%d---error:%@", result, error);
-                NSDictionary* ret;
-                if (result){
-                    ret = @{
-                        @"success": @(YES),
-                        @"errMsg": @"openApplet:ok"
-                    };
-                    callback(@[[ret toJSONString]]);
-                }else {
-                    ret = @{
-                        @"success": @(NO),
-                        @"errMsg": error.description
-                    };
-                    callback(@[[ret toJSONString]]);
-                }
-            }];
-        }else{
-            [[FATClient sharedClient] startRemoteApplet:appId sequence:@([sequence intValue]) startParams:params InParentViewController:currentVC transitionStyle:FATTranstionStylePush completion:^(BOOL result, NSError *error) {
-                NSLog(@"result:%d---error:%@", result, error);
-                NSDictionary* ret;
-                if (result){
-                    ret = @{
-                        @"success": @(YES),
-                        @"errMsg": @"openApplet:ok"
-                    };
-                    callback(@[[ret toJSONString]]);
-                }else {
-                    ret = @{
-                        @"success": @(NO),
-                        @"errMsg": error.description
-                    };
-                    callback(@[[ret toJSONString]]);
-                }
-            }];
-        }
+        [[FATClient sharedClient] startRemoteApplet:appId startParams:params InParentViewController:currentVC completion:^(BOOL result, NSError *error) {
+            NSLog(@"result:%d---error:%@", result, error);
+            NSDictionary* ret;
+            if (result){
+                ret = @{
+                    @"success": @(YES),
+                    @"errMsg": @"openApplet:ok"
+                };
+                callback(@[[ret toJSONString]]);
+            }else {
+                ret = @{
+                    @"success": @(NO),
+                    @"errMsg": error.description
+                };
+                callback(@[[ret toJSONString]]);
+            }
+        }];
     });
 
 }

package.json

@@ -23,11 +23,9 @@
   "licenseFilename": "LICENSE",
   "readmeFilename": "README.md",
   "peerDependencies": {
-    "react": "^16.8.1",
     "react-native": ">=0.60.0-rc.0 <1.0.x"
   },
   "devDependencies": {
-    "react": "^16.9.0",
     "react-native": "^0.61.5"
   }
 }