解决冲突

master
胡健辉 2022-05-20 13:50:26 +08:00
commit b5a9dd6aaf
4 changed files with 16 additions and 6 deletions

View File

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

View File

@ -134,14 +134,14 @@ static NSString *scheme = @"fatae55433be2f62915";//App对应的scheme
} }
- (void)getPhoneNumberWithAppletInfo:(FATAppletInfo *)appletInfo bindGetPhoneNumber:(void (^)(NSDictionary *))bindGetPhoneNumber { - (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 @end
@implementation NSString (FATEncode) @implementation NSString (FATEncode)

View File

@ -24,7 +24,6 @@
dic[@"description"]=info.appDescription; dic[@"description"]=info.appDescription;
dic[@"version"] = info.appVersion; dic[@"version"] = info.appVersion;
dic[@"thumbnail"]=info.appThumbnail; dic[@"thumbnail"]=info.appThumbnail;
dic[@"wechatLoginInfo"]=info.wechatLoginInfo;
success(dic); success(dic);
} }
else else
@ -33,4 +32,8 @@
} }
} }
+ (void)load {
}
@end @end

View File

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