Merge branch 'master' of ssh://gitlab.finogeeks.club:2233/finclipsdk/finclip-flutter-sdk

# Conflicts:
#	android/build.gradle
#	example/.flutter-plugins-dependencies
#	example/pubspec.lock
#	pubspec.yaml

android/build.gradle

@@ -91,6 +91,6 @@ kapt {
 }
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.finogeeks.lib:finapplet:2.26.1'
-    implementation 'com.finogeeks.mop:plugins:2.26.1'
+    implementation 'com.finogeeks.lib:finapplet:2.27.0-alpha20210602v03'
+    implementation 'com.finogeeks.mop:plugins:2.27.0-alpha20210601v05'
 }

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();

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-05-18 16:05:30.201864","version":"2.0.3"}
+{"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"}

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.25.1"
+    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"

ios/Classes/Api/MOP_initialize.h

@@ -11,12 +11,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface MOP_initialize : MOPBaseApi
 
-@property(nonatomic,copy)NSString* appkey;
-@property(nonatomic,copy)NSString* secret;
-@property(nonatomic,copy)NSString* apiServer;
-@property(nonatomic,copy)NSString* apiPrefix;
-@property(nonatomic,copy)NSString* cryptType;
+@property (nonatomic, copy) NSString *appkey;
+@property (nonatomic, copy) NSString *secret;
+@property (nonatomic, copy) NSString *apiServer;
+@property (nonatomic, copy) NSString *apiPrefix;
+@property (nonatomic, copy) NSString *cryptType;
+@property (nonatomic, copy) NSString *userId;
 @property (nonatomic, assign) BOOL disablePermission;
+
 @end
 
 NS_ASSUME_NONNULL_END

ios/Classes/Api/MOP_initialize.m

@@ -34,6 +34,7 @@
     {
         config.cryptType = FATApiCryptTypeMD5;
     }
+    config.currentUserId = [self.userId copy];
     
     NSLog(@"disablePermission:%d",self.disablePermission);
     config.disableAuthorize = self.disablePermission;

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.25.0-alpha20210429v03'
-  s.dependency 'FinAppletExt' , '2.25.0-alpha20210429v03'
+  s.dependency 'FinApplet' , '2.28.1'
+  s.dependency 'FinAppletExt' , '2.28.1'
 end
 

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;
   }

pubspec.yaml

@@ -1,6 +1,6 @@
 name: mop
 description: A Finogeeks MiniProgram Flutter SDK.
-version: '2.27.1'
+version: '2.28.1'
 homepage: https://github.com/finogeeks/mop-flutter-sdk
 
 environment: