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

# Conflicts:
#	example/.flutter-plugins-dependencies
#	ios/Classes/Api/MOP_scanOpenApplet.m
#	ios/mop.podspec
master
jizelin 2021-06-16 23:50:48 +08:00
commit 20073c8016
3 changed files with 28 additions and 4 deletions

View File

@ -91,6 +91,6 @@ kapt {
}
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.finogeeks.lib:finapplet:2.29.3'
implementation 'com.finogeeks.mop:plugins:2.29.3'
implementation 'com.finogeeks.lib:finapplet:2.30.0-alpha20210616v04'
implementation 'com.finogeeks.mop:plugins:2.30.0-alpha20210615v02'
}

View File

@ -1,9 +1,11 @@
package com.finogeeks.mop.api.mop;
import android.content.Context;
import android.text.TextUtils;
import android.util.Log;
import com.finogeeks.lib.applet.client.FinAppClient;
import com.finogeeks.lib.applet.sdk.model.StartAppletDecryptRequest;
import com.finogeeks.mop.api.BaseApi;
import com.finogeeks.mop.interfaces.ICallback;
@ -26,11 +28,19 @@ public class AppletModule extends BaseApi {
@Override
public String[] apis() {
return new String[]{"openApplet"};
return new String[]{"openApplet", "scanOpenApplet"};
}
@Override
public void invoke(String event, Map param, ICallback callback) {
if ("openApplet".equals(event)) {
openApplet(param, callback);
} else if ("scanOpenApplet".equals(event)) {
scanOpenApplet(param, callback);
}
}
private void openApplet(Map param, ICallback callback) {
if (param.get("appId") == null) {
callback.onFail(new HashMap() {
{
@ -89,4 +99,18 @@ public class AppletModule extends BaseApi {
// }
callback.onSuccess(new HashMap());
}
private void scanOpenApplet(Map param, ICallback callback) {
String info = String.valueOf(param.get("info"));
if (TextUtils.isEmpty(info)) {
callback.onFail(new HashMap() {
{
put("info", "info不能为" + info);
}
});
return;
}
FinAppClient.INSTANCE.getAppletApiManager().startApplet(mContext, new StartAppletDecryptRequest(info));
callback.onSuccess(new HashMap());
}
}

View File

@ -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-06-15 22:42:21.602758","version":"2.0.3"}
{"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-06-09 21:47:48.185375","version":"2.0.3"}