From 3874690bbb93ef864135bc99f07785ee61f80f7b Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 19 Jul 2021 14:46:36 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A2=9E=E5=8A=A0needEncrypt?= =?UTF-8?q?=E5=8F=82=E6=95=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e9dd1a5c --- android/build.gradle | 2 +- .../java/com/finogeeks/mop/api/mop/BaseModule.java | 12 +----------- lib/mop.dart | 8 ++------ 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 0d49fd9..885fb69 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.33.0-alpha20210719v02' + implementation 'com.finogeeks.lib:finapplet:2.32.1' implementation 'com.finogeeks.mop:plugins:2.32.1' } \ 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 226c2c9..1694dbd 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 @@ -6,14 +6,11 @@ import android.content.Context; import com.finogeeks.lib.applet.BuildConfig; import com.finogeeks.lib.applet.client.FinAppClient; import com.finogeeks.lib.applet.client.FinAppConfig; -import com.finogeeks.lib.applet.client.FinStoreConfig; import com.finogeeks.lib.applet.interfaces.FinCallback; import com.finogeeks.mop.api.BaseApi; import com.finogeeks.mop.interfaces.ICallback; import com.finogeeks.mop.service.MopPluginService; -import java.util.ArrayList; -import java.util.List; import java.util.Map; public class BaseModule extends BaseApi { @@ -66,21 +63,14 @@ public class BaseModule extends BaseApi { if (param.get("userId") != null) { userId = (String) param.get("userId"); } - - Boolean needEncrypt = (Boolean) param.get("needEncrypt"); - if (needEncrypt == null) needEncrypt = false; - Boolean debug = (Boolean) param.get("debug"); - if (debug == null) debug = false; - FinAppConfig config = new FinAppConfig.Builder() .setSdkKey(appkey) .setSdkSecret(secret) .setApiUrl(apiServer) .setApiPrefix(apiPrefix) .setEncryptionType(cryptType) - .setNeedEncrypt(needEncrypt) .setUserId(userId) - .setDebugMode(debug) + .setDebugMode(BuildConfig.DEBUG) .setDisableRequestPermissions(disablePermission) .build(); diff --git a/lib/mop.dart b/lib/mop.dart index ffe14ef..aa0f70f 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -74,9 +74,7 @@ class Mop { String apiPrefix, String cryptType, bool disablePermission, - String userId, - bool needEncrypt = false, - bool debug = false}) async { + String userId}) async { final Map ret = await _channel.invokeMethod('initialize', { 'appkey': appkey, 'secret': secret, @@ -84,9 +82,7 @@ class Mop { 'apiPrefix': apiPrefix, 'cryptType': cryptType, 'disablePermission': disablePermission, - 'userId': userId, - "needEncrypt": needEncrypt, - "debug": debug + 'userId': userId }); return ret; }