From b07d449771a78ceac10cbb18b423c9b6f168f378 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Wed, 2 Jun 2021 11:33:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0userId=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- .../java/com/finogeeks/mop/api/mop/BaseModule.java | 5 +++++ example/.flutter-plugins-dependencies | 2 +- example/pubspec.lock | 10 +++++----- lib/mop.dart | 6 ++++-- pubspec.lock | 8 ++++---- 6 files changed, 20 insertions(+), 13 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d0ae117..cfbfa27 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -91,6 +91,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210601v05' + implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210602v03' implementation 'com.finogeeks.mop:plugins:2.27.0-alpha20210601v05' } \ No newline at end of file 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 a6ad10b..6c95d06 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 @@ -59,12 +59,17 @@ public class BaseModule extends BaseApi { if (disablePermission == null) { disablePermission = false; } + String userId = null; + if (param.get("userId") != null) { + userId = (String) param.get("userId"); + } FinAppConfig config = new FinAppConfig.Builder() .setSdkKey(appkey) .setSdkSecret(secret) .setApiUrl(apiServer) .setApiPrefix(apiPrefix) .setEncryptionType(cryptType) + .setUserId(userId) .setDebugMode(BuildConfig.DEBUG) .setDisableRequestPermissions(disablePermission) .build(); diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 45782d2..ba384a1 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/beetle/Desktop/finogeeks/gitlab/finosprite/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-04-30 09:33:21.567900","version":"2.0.3"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"mop","path":"/Users/kangxuyao/StudioProjects/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/kangxuyao/StudioProjects/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-06-02 11:08:31.029967","version":"2.3.0-2.0.pre.105"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 75553ba..a7d9bac 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.0" + version: "2.6.0" boolean_selector: dependency: transitive description: @@ -87,7 +87,7 @@ packages: path: ".." relative: true source: path - version: "2.24.7" + version: "2.27.1" path: dependency: transitive description: @@ -106,7 +106,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -141,7 +141,7 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -157,5 +157,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-0.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=1.10.0" diff --git a/lib/mop.dart b/lib/mop.dart index d8f6d69..643a7f6 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -73,14 +73,16 @@ class Mop { {String apiServer, String apiPrefix, String cryptType, - bool disablePermission}) async { + bool disablePermission, + String userId}) async { final Map ret = await _channel.invokeMethod('initialize', { 'appkey': appkey, 'secret': secret, 'apiServer': apiServer, 'apiPrefix': apiPrefix, 'cryptType': cryptType, - 'disablePermission': disablePermission + 'disablePermission': disablePermission, + 'userId': userId }); return ret; } diff --git a/pubspec.lock b/pubspec.lock index c2442ac..f6eefd7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.5.0" + version: "2.6.0" boolean_selector: dependency: transitive description: @@ -92,7 +92,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -127,7 +127,7 @@ packages: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: @@ -143,5 +143,5 @@ packages: source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-0.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=1.10.0"