From b5e11885770f6f27c42f3e80b31b68a7d0fcd41d Mon Sep 17 00:00:00 2001 From: yangtao Date: Sun, 25 Apr 2021 08:45:17 +0800 Subject: [PATCH 1/9] release: version:2.24.4 --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 60d2cea..059695a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.24.3' +version: '2.24.4' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 6a3c0d80f3a8cfa1df7dbace8e8cc2182c691c5d Mon Sep 17 00:00:00 2001 From: wanghualei Date: Wed, 24 Mar 2021 17:26:39 +0800 Subject: [PATCH 2/9] update version --- ios/Classes/Api/MOP_initialize.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 8f134d7..14f73ed 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -40,7 +40,7 @@ NSError* error = nil; FATUIConfig *uiconfig = [[FATUIConfig alloc]init]; uiconfig.autoAdaptDarkMode = YES; - uiconfig.moreMenuStyle = FATMoreViewStyleNormal; + // uiconfig.moreMenuStyle = FATMoreViewStyleNormal; [[FATClient sharedClient] initWithConfig:config uiConfig:uiconfig error:&error]; if (error) { failure(@"初始化失败"); From f13de520ef0f78908151eaf8b32eaa2dfdf2c2f1 Mon Sep 17 00:00:00 2001 From: jizelin Date: Wed, 21 Apr 2021 21:19:48 +0800 Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=20=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=9B=BD=E5=AF=86=E5=8A=A0=E5=AF=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_smsign.h | 19 +++++++++++++++++++ ios/Classes/Api/MOP_smsign.m | 21 +++++++++++++++++++++ ios/mop.podspec | 4 ++-- lib/mop.dart | 9 +++++++++ 4 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 ios/Classes/Api/MOP_smsign.h create mode 100644 ios/Classes/Api/MOP_smsign.m diff --git a/ios/Classes/Api/MOP_smsign.h b/ios/Classes/Api/MOP_smsign.h new file mode 100644 index 0000000..3ab4579 --- /dev/null +++ b/ios/Classes/Api/MOP_smsign.h @@ -0,0 +1,19 @@ +// +// MOP_smsign.h +// mop +// +// Created by beetle_92 on 2021/4/21. +// + +#import +#import "MOPBaseApi.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MOP_smsign : MOPBaseApi + +@property (nonatomic, copy) NSString *plainText; + +@end + +NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Api/MOP_smsign.m b/ios/Classes/Api/MOP_smsign.m new file mode 100644 index 0000000..9058ee4 --- /dev/null +++ b/ios/Classes/Api/MOP_smsign.m @@ -0,0 +1,21 @@ +// +// MOP_smsign.m +// mop +// +// Created by beetle_92 on 2021/4/21. +// + +#import "MOP_smsign.h" +#import + +@implementation MOP_smsign + +- (void)setupApiWithSuccess:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel +{ + NSLog(@"smsign"); + NSString *signature = [[FATClient sharedClient] getSM3String:self.plainText]; + NSLog(@"signature = %@", signature); + success(@{@"data": signature}); +} + +@end diff --git a/ios/mop.podspec b/ios/mop.podspec index 4cd4676..711d709 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.24.3' - s.dependency 'FinAppletExt' , '2.24.3' + s.dependency 'FinApplet' , '2.25.0-alpha20210421v01' + s.dependency 'FinAppletExt' , '2.25.0-alpha20210421v01' end diff --git a/lib/mop.dart b/lib/mop.dart index 1ab0a4b..d8f6d69 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -195,4 +195,13 @@ class Mop { _extensionApis[name] = handler; _channel.invokeMethod("registerExtensionApi", {"name": name}); } + + /// 获取国密加密 + Future getSMSign(String plainText) async { + var result = + await _channel.invokeMapMethod("smsign", {'plainText': plainText}); + var data = result['data']['data']; + print(data); + return data; + } } From e40794769d9807c6c5005ff7fa1d085e4f4600f3 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Fri, 16 Apr 2021 11:14:25 +0800 Subject: [PATCH 4/9] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 0d4e8fc..9613c9a 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.24.3' + implementation 'com.finogeeks.lib:finapplet:2.24.4-alpha20210416v01' implementation 'com.finogeeks.mop:plugins:2.24.3' } \ No newline at end of file From b2228b32fecd0cd6f4c8968e346cf295aab0e018 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Fri, 16 Apr 2021 11:27:10 +0800 Subject: [PATCH 5/9] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 9613c9a..e060fc4 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.24.4-alpha20210416v01' + implementation 'com.finogeeks.lib:finapplet:2.24.4-alpha20210416V01' implementation 'com.finogeeks.mop:plugins:2.24.3' } \ No newline at end of file From f2e161e4d2a0102a7d0065ad3b49ccfaf312680d Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Thu, 22 Apr 2021 09:51:22 +0800 Subject: [PATCH 6/9] =?UTF-8?q?smsign=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/finogeeks/mop/api/ApisManager.java | 2 ++ .../finogeeks/mop/api/mop/SmSignModule.java | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 android/src/main/java/com/finogeeks/mop/api/mop/SmSignModule.java diff --git a/android/src/main/java/com/finogeeks/mop/api/ApisManager.java b/android/src/main/java/com/finogeeks/mop/api/ApisManager.java index c9dca8b..39bdfee 100644 --- a/android/src/main/java/com/finogeeks/mop/api/ApisManager.java +++ b/android/src/main/java/com/finogeeks/mop/api/ApisManager.java @@ -9,6 +9,7 @@ import com.finogeeks.mop.api.mop.AppletModule; import com.finogeeks.mop.api.mop.BaseModule; import com.finogeeks.mop.api.mop.ExtensionApiModule; import com.finogeeks.mop.api.mop.VersionModule; +import com.finogeeks.mop.api.mop.SmSignModule; import com.finogeeks.mop.interfaces.Event; import com.finogeeks.mop.interfaces.IApi; @@ -69,6 +70,7 @@ public class ApisManager { add(new AppletHandlerModule(activity)); add(new ExtensionApiModule(activity)); add(new VersionModule(activity)); + add(new SmSignModule(activity)); } private void add(IApi api) { diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/SmSignModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/SmSignModule.java new file mode 100644 index 0000000..2d948ae --- /dev/null +++ b/android/src/main/java/com/finogeeks/mop/api/mop/SmSignModule.java @@ -0,0 +1,34 @@ +package com.finogeeks.mop.api.mop; + +import android.content.Context; + +import com.finogeeks.finochat.sdkcore.client.FinoChatSDKCoreClient; +import com.finogeeks.lib.applet.client.FinAppClient; +import com.finogeeks.lib.applet.db.entity.FinApplet; +import com.finogeeks.mop.api.BaseApi; +import com.finogeeks.mop.interfaces.ICallback; + +import java.util.HashMap; +import java.util.Map; + +public class SmSignModule extends BaseApi { + + public SmSignModule(Context context) { + super(context); + } + + @Override + public String[] apis() { + return new String[]{"smsign"}; + } + + @Override + public void invoke(String event, Map param, ICallback callback) { + String text = (String) param.get("plainText"); + String result = FinoChatSDKCoreClient.getInstance().finoLicenseService().messageDigest(text); + Map res = new HashMap<>(); + res.put("data", result); + callback.onSuccess(res); + } + +} From c8f5b8a3d8e5fb2cc90dc6017ac05c4303e0118b Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Thu, 22 Apr 2021 12:13:02 +0800 Subject: [PATCH 7/9] version++ --- android/build.gradle | 2 +- example/.flutter-plugins-dependencies | 2 +- example/pubspec.lock | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index e060fc4..0c2d348 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.24.4-alpha20210416V01' + implementation 'com.finogeeks.lib:finapplet:2.25.0-alpha20210422v01' implementation 'com.finogeeks.mop:plugins:2.24.3' } \ No newline at end of file diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index 06950b8..af0cf22 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-13 14:41:18.519464","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-04-22 10:00:57.239343","version":"2.1.0-13.0.pre.340"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 9b6cd84..aecf9d9 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -87,7 +87,7 @@ packages: path: ".." relative: true source: path - version: "2.24.3" + version: "2.24.4" 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: From d2201d007585bb8fdb84459d29b2e96bd8eff6ee Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 26 Apr 2021 14:49:15 +0800 Subject: [PATCH 8/9] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 0c2d348..d6bfa19 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.25.0-alpha20210422v01' + implementation 'com.finogeeks.lib:finapplet:2.25.0-alpha20210426v01' implementation 'com.finogeeks.mop:plugins:2.24.3' } \ No newline at end of file From 38d6a41fe49bc499903d854c815c50b5029a391f Mon Sep 17 00:00:00 2001 From: jenkins Date: Tue, 27 Apr 2021 10:22:47 +0800 Subject: [PATCH 9/9] version++ --- android/build.gradle | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d6bfa19..c6181c4 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.25.0-alpha20210426v01' - implementation 'com.finogeeks.mop:plugins:2.24.3' + implementation 'com.finogeeks.lib:finapplet:2.24.7' + implementation 'com.finogeeks.mop:plugins:2.24.7' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 059695a..e57e1d4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.24.4' +version: '2.24.7' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: