merge conflict

android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java

@@ -76,6 +76,10 @@ public class BaseModule extends BaseApi {
         if (debug == null) debug = false;
         Boolean bindAppletWithMainProcess = (Boolean) param.get("bindAppletWithMainProcess");
         if (bindAppletWithMainProcess == null) bindAppletWithMainProcess = false;
+        Integer pageCountLimit = (Integer) param.get("pageCountLimit");
+        if (pageCountLimit == null) {
+            pageCountLimit = 0;
+        }
 
         String customWebViewUserAgent = (String) param.get("customWebViewUserAgent");
         Integer appletIntervalUpdateLimit = (Integer) param.get("appletIntervalUpdateLimit");
@@ -117,7 +121,8 @@ public class BaseModule extends BaseApi {
                 .setUserId(userId)
                 .setDebugMode(debug)
                 .setDisableRequestPermissions(disablePermission)
-                .setBindAppletWithMainProcess(bindAppletWithMainProcess);
+                .setBindAppletWithMainProcess(bindAppletWithMainProcess)
+                .setPageCountLimit(pageCountLimit);
 
         if (customWebViewUserAgent != null)
             builder.setCustomWebViewUserAgent(customWebViewUserAgent);

ios/Classes/Api/MOPAppletDelegate.m

@@ -134,14 +134,14 @@ static NSString *scheme = @"fatae55433be2f62915";//App对应的scheme
 }
 
 - (void)getPhoneNumberWithAppletInfo:(FATAppletInfo *)appletInfo bindGetPhoneNumber:(void (^)(NSDictionary *))bindGetPhoneNumber {
-    self.bindGetPhoneNumber = bindGetPhoneNumber;
+    NSDictionary *params = @{@"name":@"getPhoneNumber"};
-    FlutterMethodChannel *channel = [[MopPlugin instance] methodChannel];
-    [channel invokeMethod:@"extensionApi:getPhoneNumber" arguments:@{} result:^(id _Nullable result) {
 
+    FlutterMethodChannel *channel = [[MopPlugin instance] methodChannel];
+    [channel invokeMethod:@"extensionApi:getPhoneNumber" arguments:params result:^(id _Nullable result) {
+        !bindGetPhoneNumber?: bindGetPhoneNumber(result);
     }];
 
 }
-
 @end
 
 @implementation NSString (FATEncode)

ios/Classes/Api/MOP_currentApplet.m

@@ -33,4 +33,8 @@
     }
 }
 
++ (void)load {
+    
+}
+
 @end

ios/mop.podspec

@@ -17,7 +17,7 @@ A finclip miniprogram flutter sdk.
   s.dependency 'Flutter'
   s.ios.deployment_target = '9.0'
 
-  s.dependency 'FinApplet' , '2.37.0-alpha20220428v07'
+  s.dependency 'FinApplet' , '2.37.0-alpha20220512v03'
-  s.dependency 'FinAppletExt' , '2.37.0-alpha20220428v07'
+  s.dependency 'FinAppletExt' , '2.37.0-alpha20220512v03'
 end
 

lib/mop.dart

@@ -315,6 +315,7 @@ class Mop {
     String? userId,
     bool debug = false,
     bool bindAppletWithMainProcess = false,
+    int? pageCountLimit = 0,
     List<FinStoreConfig>? finStoreConfigs,
     UIConfig? uiConfig,
     String? customWebViewUserAgent,
@@ -335,6 +336,7 @@ class Mop {
       'userId': userId,
       "debug": debug,
       "bindAppletWithMainProcess": bindAppletWithMainProcess,
+      "pageCountLimit": pageCountLimit,
       "finStoreConfigs": storeConfigs,
       "uiConfig": uiConfig?.toMap(),
       "customWebViewUserAgent": customWebViewUserAgent,