From fbacc07996206491eec657ccad4353d3b537e4c5 Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Wed, 11 May 2022 14:58:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96page-limit=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/finogeeks/mop/api/mop/BaseModule.java | 7 ++++++- lib/mop.dart | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java index 7f5d87b..627a43d 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java +++ b/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); diff --git a/lib/mop.dart b/lib/mop.dart index df9a0e4..a294654 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -314,6 +314,7 @@ class Mop { String? userId, bool debug = false, bool bindAppletWithMainProcess = false, + int? pageCountLimit = 0, List? finStoreConfigs, UIConfig? uiConfig, String? customWebViewUserAgent, @@ -334,6 +335,7 @@ class Mop { 'userId': userId, "debug": debug, "bindAppletWithMainProcess": bindAppletWithMainProcess, + "pageCountLimit": pageCountLimit, "finStoreConfigs": storeConfigs, "uiConfig": uiConfig?.toMap(), "customWebViewUserAgent": customWebViewUserAgent, From 0dd335b356254bd8954daf6837ffd81e1848ae2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=81=A5=E8=BE=89?= <27-hujianhui@users.noreply.gitlab.gitlab.finogeeks.club> Date: Tue, 17 May 2022 11:23:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_currentApplet.m | 5 +++++ ios/mop.podspec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ios/Classes/Api/MOP_currentApplet.m b/ios/Classes/Api/MOP_currentApplet.m index bfbd498..d4f4f41 100644 --- a/ios/Classes/Api/MOP_currentApplet.m +++ b/ios/Classes/Api/MOP_currentApplet.m @@ -24,6 +24,7 @@ dic[@"description"]=info.appDescription; dic[@"version"] = info.appVersion; dic[@"thumbnail"]=info.appThumbnail; + dic[@"wechatLoginInfo"]=info.wechatLoginInfo; success(dic); } else @@ -32,4 +33,8 @@ } } ++ (void)load { + +} + @end diff --git a/ios/mop.podspec b/ios/mop.podspec index 94cf3e3..9e7afd7 100644 --- a/ios/mop.podspec +++ b/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 'FinAppletExt' , '2.37.0-alpha20220428v07' + s.dependency 'FinApplet' , '2.37.0-alpha20220512v03' + s.dependency 'FinAppletExt' , '2.37.0-alpha20220512v03' end From 1a10fe3605f399a3bf7ee078e4d822c54cb798cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=83=A1=E5=81=A5=E8=BE=89?= <27-hujianhui@users.noreply.gitlab.gitlab.finogeeks.club> Date: Tue, 17 May 2022 17:58:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E7=99=BB=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOPAppletDelegate.m | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index 00322f6..7ef44c8 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -133,7 +133,15 @@ static NSString *scheme = @"fatae55433be2f62915";//App对应的scheme [[UIApplication sharedApplication] openURL:[NSURL URLWithString:url]]; } +- (void)getPhoneNumberWithAppletInfo:(FATAppletInfo *)appletInfo bindGetPhoneNumber:(void (^)(NSDictionary *))bindGetPhoneNumber { + NSDictionary *params = @{@"name":@"getPhoneNumber"}; + FlutterMethodChannel *channel = [[MopPlugin instance] methodChannel]; + [channel invokeMethod:@"extensionApi:getPhoneNumber" arguments:params result:^(id _Nullable result) { + !bindGetPhoneNumber?: bindGetPhoneNumber(result); + }]; + +} @end @implementation NSString (FATEncode)