From e3fab009d5c6f30fbab9850464c2f9827d93b045 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Thu, 24 Mar 2022 15:46:27 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3finstoreConfig=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/finogeeks/mop/api/mop/BaseModule.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) 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 1db0bb0..68dd350 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 @@ -83,8 +83,23 @@ public class BaseModule extends BaseApi { Gson gson = new Gson(); List finStoreConfigs = null; if (param.get("finStoreConfigs") != null) { - finStoreConfigs = gson.fromJson(gson.toJson(param.get("finStoreConfigs")), new TypeToken>() { - }.getType()); + finStoreConfigs = new ArrayList<>(); + List> configs = (List>) param.get("finStoreConfigs"); + for (Map config : configs) { + for (String key : config.keySet()) { + String sdkKey = (String) config.get("sdkKey"); + String sdkSecret = (String) config.get("sdkSecret"); + String apiUrl = (String) config.get("apiServer"); + String apmUrl = (String) config.get("apmServer"); + if (apmUrl == null) apmUrl = ""; + String fingerprint = (String) config.get("fingerprint"); + if (fingerprint == null) fingerprint = ""; + String encryptType = (String) config.get("cryptType"); + Boolean encryptServerData1 = (Boolean) config.get("encryptServerData"); + if (encryptServerData1 == null) encryptServerData1 = false + finStoreConfigs.add(new FinStoreConfig(sdkKey, sdkSecret, apiUrl, apmUrl, "", fingerprint, encryptType, encryptServerData1)); + } + } } FinAppConfig.UIConfig uiConfig = null; if (param.get("uiConfig") != null) { From f3d920a9fb92b435d06603f34bc5938136f6a9c7 Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 24 Mar 2022 15:51:35 +0800 Subject: [PATCH 02/15] release: version:2.35.14 --- ios/mop.podspec | 4 ++-- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 7a375bc..3cbf61a 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.36.0-alpha20220323v02' - s.dependency 'FinAppletExt' , '2.36.0-alpha20220323v02' + s.dependency 'FinApplet' , '2.35.13' + s.dependency 'FinAppletExt' , '2.35.13' end diff --git a/pubspec.yaml b/pubspec.yaml index 3f09934..6fbcfbc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.35.11' +version: '2.35.14' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 6a34c70efb8c1b0c206b8c3447644aac9b6f60db Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Thu, 24 Mar 2022 16:03:27 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3finstoreConfig=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/src/main/java/com/finogeeks/mop/api/mop/BaseModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 68dd350..7f5d87b 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 @@ -96,7 +96,7 @@ public class BaseModule extends BaseApi { if (fingerprint == null) fingerprint = ""; String encryptType = (String) config.get("cryptType"); Boolean encryptServerData1 = (Boolean) config.get("encryptServerData"); - if (encryptServerData1 == null) encryptServerData1 = false + if (encryptServerData1 == null) encryptServerData1 = false; finStoreConfigs.add(new FinStoreConfig(sdkKey, sdkSecret, apiUrl, apmUrl, "", fingerprint, encryptType, encryptServerData1)); } } From 956c1f7124604b4d5ea570334c83907809f7a17e Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Tue, 29 Mar 2022 16:03:59 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=A1=A5=E5=85=85finishRunningApplet?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/finogeeks/mop/api/mop/AppletManageModule.java | 10 +++++++++- publish.sh | 4 ++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletManageModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletManageModule.java index df67b0e..1903dce 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletManageModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletManageModule.java @@ -31,7 +31,7 @@ public class AppletManageModule extends BaseApi { @Override public String[] apis() { return new String[]{"currentApplet", "closeAllApplets", "clearApplets", "removeUsedApplet", "closeApplet", - "setActivityTransitionAnim", "sendCustomEvent", "callJS"}; + "setActivityTransitionAnim", "sendCustomEvent", "callJS","finishRunningApplet"}; } @Override @@ -58,6 +58,14 @@ public class AppletManageModule extends BaseApi { } else if (event.equals("closeAllApplets")) { FinAppClient.INSTANCE.getAppletApiManager().closeApplets(); callback.onSuccess(null); + }else if(event.equals("finishRunningApplet")){ + if (param.containsKey("appId") && param.get("appId") instanceof String) { + String appId = (String) param.get("appId"); + FinAppClient.INSTANCE.getAppletApiManager().finishRunningApplet(appId); + callback.onSuccess(null); + } else { + callback.onFail(null); + } } else if (event.equals("closeApplet")) { if (param.containsKey("appId") && param.get("appId") instanceof String) { String appId = (String) param.get("appId"); diff --git a/publish.sh b/publish.sh index d05023b..d80f7c2 100755 --- a/publish.sh +++ b/publish.sh @@ -1,4 +1,4 @@ + flutter packages pub publish --dry-run --server=https://pub.dartlang.org -flutter packages pub publish --server=https://pub.dartlang.org - +flutter packages pub publish --server=https://pub.dartlang.org --force \ No newline at end of file From 52756efc50f7c1f70a576a38cb183426986d900f Mon Sep 17 00:00:00 2001 From: jizelin Date: Thu, 31 Mar 2022 15:50:34 +0800 Subject: [PATCH 05/15] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=8F=9C?= =?UTF-8?q?=E5=8D=95ios=E4=BA=8B=E4=BB=B6=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOPAppletDelegate.m | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index dab0502..00322f6 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -84,11 +84,11 @@ return models; } -- (void)customMenu:(id)customMenu inApplet:(FATAppletInfo *)appletInfo didClickAtPath:(NSString *)path { +- (void)clickCustomItemMenuWithInfo:(NSDictionary *)contentInfo inApplet:(FATAppletInfo *)appletInfo completion:(void (^)(FATExtensionCode code, NSDictionary *result))completion { NSDictionary *arguments = @{ - @"appId": appletInfo.appId, - @"path": path, - @"menuId": customMenu.menuId, + @"appId": contentInfo[@"appId"], + @"path": contentInfo[@"path"], + @"menuId": contentInfo[@"menuId"], @"appInfo": appletInfo.description }; FlutterMethodChannel *channel = [[MopPlugin instance] methodChannel]; @@ -96,26 +96,6 @@ }]; - if ([@"Desktop" isEqualToString:customMenu.menuId]) { - [self addToDesktopItemClick:appletInfo path:path]; - } - -} - -- (void)clickCustomItemMenuWithInfo:(NSDictionary *)contentInfo completion:(void (^)(FATExtensionCode code, NSDictionary *result))completion { - NSDictionary *arguments = @{ - @"appId": contentInfo[@"appId"], - @"path": contentInfo[@"path"], - @"menuId": contentInfo[@"menuId"], - @"appInfo": [NSString stringWithFormat:@"{'title': '%@', 'description': '%@', 'imageUrl': '%@'}", contentInfo[@"title"], contentInfo[@"description"], contentInfo[@"imageUrl"]] - }; - FlutterMethodChannel *channel = [[MopPlugin instance] methodChannel]; - [channel invokeMethod:@"extensionApi:onCustomMenuClick" arguments:arguments result:^(id _Nullable result) { - - }]; -} - -- (void)clickCustomItemMenuWithInfo:(NSDictionary *)contentInfo inApplet:(FATAppletInfo *)appletInfo completion:(void (^)(FATExtensionCode code, NSDictionary *result))completion { if ([@"Desktop" isEqualToString:contentInfo[@"menuId"]]) { [self addToDesktopItemClick:appletInfo path:contentInfo[@"path"]]; } From 7c17c4255d5566ae05212fa4e98cf5a3353829e3 Mon Sep 17 00:00:00 2001 From: wangtao Date: Thu, 31 Mar 2022 15:56:59 +0800 Subject: [PATCH 06/15] =?UTF-8?q?fix:=20iOS=E7=AB=AF=E6=8E=A5=E6=94=B6?= =?UTF-8?q?=E6=B5=8B=E6=BB=91=E5=85=B3=E9=97=AD=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 a84fa05..8786ad0 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -91,7 +91,7 @@ uiconfig.appletText = _uiConfig[@"appletText"]; uiconfig.hideTransitionCloseButton = [_uiConfig[@"hideTransitionCloseButton"] boolValue]; - uiconfig.disableSlideCloseAppletGesture = _uiConfig[@"disableSlideCloseAppletGesture"]; + uiconfig.disableSlideCloseAppletGesture = [_uiConfig[@"disableSlideCloseAppletGesture"] boolValue]; if (_uiConfig[@"capsuleConfig"]) { NSDictionary *capsuleConfigDic = _uiConfig[@"capsuleConfig"]; FATCapsuleConfig *capsuleConfig = [[FATCapsuleConfig alloc]init]; From 4fa78c532565a2642e1e56b363759e6dbb802df7 Mon Sep 17 00:00:00 2001 From: jenkins Date: Sat, 2 Apr 2022 19:19:44 +0800 Subject: [PATCH 07/15] 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 a9b12d8..8014956 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.35.11' - implementation 'com.finogeeks.mop:plugins:2.35.11' + implementation 'com.finogeeks.lib:finapplet:2.36.1' + implementation 'com.finogeeks.mop:plugins:2.36.1' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 6fbcfbc..9964153 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.35.14' +version: '2.36.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 44b7ee83ee79a46d000fb27d1831d8eda6b0be6b Mon Sep 17 00:00:00 2001 From: wanghualei Date: Thu, 7 Apr 2022 11:42:03 +0800 Subject: [PATCH 08/15] update sdk --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 3cbf61a..fa7f579 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.35.13' - s.dependency 'FinAppletExt' , '2.35.13' + s.dependency 'FinApplet' , '2.36.1' + s.dependency 'FinAppletExt' , '2.36.1' end From 4f07a78e7d769f4dd9132b80701d918ddbf4dd24 Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Fri, 15 Apr 2022 15:07:59 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACsdk=EF=BC=8C=E5=A2=9E=E5=8A=A0IAppletHandler=E9=87=8D?= =?UTF-8?q?=E5=86=99=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- .../mop/api/mop/AppletHandlerModule.java | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8014956..97ffe5e 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.36.1' + implementation 'com.finogeeks.lib:finapplet:2.37.0-alpha20220415v03' implementation 'com.finogeeks.mop:plugins:2.36.1' } \ No newline at end of file diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java index 168373e..1bae67f 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java @@ -205,6 +205,63 @@ public class AppletHandlerModule extends BaseApi { public void onNavigationBarCloseButtonClicked(@NotNull String s) { } + + @Override + public boolean launchApp(@Nullable String appParameter) { + /*Log.d("AppletHandlerModule", "getUserInfo"); + CountDownLatch latch = new CountDownLatch(1); + final Map[] ret = new Map[1]; + Map params = new HashMap(); + params.put("appParameter", appParameter); + handler.post(() -> { + channel.invokeMethod("extensionApi:launchApp", params, new MethodChannel.Result() { + @Override + public void success(Object result) { + ret[0] = (Map) result; + latch.countDown(); + } + + @Override + public void error(String errorCode, String errorMessage, Object errorDetails) { + latch.countDown(); + } + + @Override + public void notImplemented() { + latch.countDown(); + } + }); + }); + try { + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + if (ret[0].size() > 0) + return ret[0]; + else + return null;*/ + return false; + } + + @Override + public void getPhoneNumber(@NotNull IAppletCallback callback) { + } + + @Override + public void chooseAvatar(@NotNull IAppletCallback callback) { + } + + @Override + public boolean contact(@NotNull JSONObject json) { + return false; + } + + @Override + public boolean feedback(@NotNull Bundle bundle) { + return false + } + }); callback.onSuccess(null); } From 9937e0725ef2d00252f2226043544bf58dd3fefe Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Fri, 15 Apr 2022 15:07:59 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=ACsdk=EF=BC=8C=E5=A2=9E=E5=8A=A0IAppletHandler=E9=87=8D?= =?UTF-8?q?=E5=86=99=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- .../mop/api/mop/AppletHandlerModule.java | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 8014956..97ffe5e 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.36.1' + implementation 'com.finogeeks.lib:finapplet:2.37.0-alpha20220415v03' implementation 'com.finogeeks.mop:plugins:2.36.1' } \ No newline at end of file diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java index 168373e..23b64a5 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java @@ -205,6 +205,63 @@ public class AppletHandlerModule extends BaseApi { public void onNavigationBarCloseButtonClicked(@NotNull String s) { } + + @Override + public boolean launchApp(@Nullable String appParameter) { + /*Log.d("AppletHandlerModule", "getUserInfo"); + CountDownLatch latch = new CountDownLatch(1); + final Map[] ret = new Map[1]; + Map params = new HashMap(); + params.put("appParameter", appParameter); + handler.post(() -> { + channel.invokeMethod("extensionApi:launchApp", params, new MethodChannel.Result() { + @Override + public void success(Object result) { + ret[0] = (Map) result; + latch.countDown(); + } + + @Override + public void error(String errorCode, String errorMessage, Object errorDetails) { + latch.countDown(); + } + + @Override + public void notImplemented() { + latch.countDown(); + } + }); + }); + try { + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + if (ret[0].size() > 0) + return ret[0]; + else + return null;*/ + return false; + } + + @Override + public void getPhoneNumber(@NotNull IAppletCallback callback) { + } + + @Override + public void chooseAvatar(@NotNull IAppletCallback callback) { + } + + @Override + public boolean contact(@NotNull JSONObject json) { + return false; + } + + @Override + public boolean feedback(@NotNull Bundle bundle) { + return false; + } + }); callback.onSuccess(null); } From 4f7004630d28a8b63ddef7ba57a71b1859f9bd19 Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 15 Apr 2022 15:25:26 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/finogeeks/mop/api/mop/AppletHandlerModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java index 1bae67f..23b64a5 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java @@ -259,7 +259,7 @@ public class AppletHandlerModule extends BaseApi { @Override public boolean feedback(@NotNull Bundle bundle) { - return false + return false; } }); From efb51b16061ceb7f887339d9cfa2591b0ea142e6 Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Fri, 15 Apr 2022 15:30:51 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BF=85=E8=A6=81impor?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/finogeeks/mop/api/mop/AppletHandlerModule.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java index 23b64a5..a6179c5 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java @@ -2,6 +2,7 @@ package com.finogeeks.mop.api.mop; import android.content.Context; import android.graphics.Bitmap; +import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.util.Log; @@ -20,6 +21,7 @@ import com.google.gson.reflect.TypeToken; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.json.JSONObject; import java.util.ArrayList; import java.util.HashMap; From 3c8bcea19e666fea1fbc96f978da5d3b053d6d56 Mon Sep 17 00:00:00 2001 From: yangbingqiao Date: Fri, 15 Apr 2022 19:16:35 +0800 Subject: [PATCH 13/15] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E6=97=B6bitmap=E5=8F=AF=E8=83=BD=E4=B8=BA=E7=A9=BA?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=B4=A9=E6=BA=83=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../finogeeks/mop/api/mop/AppletHandlerModule.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java index a6179c5..8b65c24 100644 --- a/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java +++ b/android/src/main/java/com/finogeeks/mop/api/mop/AppletHandlerModule.java @@ -23,12 +23,12 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.json.JSONObject; +import java.io.ByteArrayOutputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.CountDownLatch; -import java.io.ByteArrayOutputStream; import io.flutter.plugin.common.MethodChannel; @@ -63,10 +63,12 @@ public class AppletHandlerModule extends BaseApi { Map params = new HashMap<>(); params.put("appletInfo", GsonUtil.gson.fromJson(s, new TypeToken>() { }.getType())); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - bitmap.compress(Bitmap.CompressFormat.JPEG, 100, baos); - byte[] data = baos.toByteArray(); - params.put("bitmap", data); + if (bitmap != null) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + bitmap.compress(Bitmap.CompressFormat.JPEG, 100, baos); + byte[] data = baos.toByteArray(); + params.put("bitmap", data); + } handler.post(() -> { channel.invokeMethod("extensionApi:forwardApplet", params, new MethodChannel.Result() { @Override From d4ea061abfb3f79f24a0c11e698a82ce7c0d90d7 Mon Sep 17 00:00:00 2001 From: jenkins Date: Sun, 17 Apr 2022 19:04:40 +0800 Subject: [PATCH 14/15] 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 97ffe5e..e55b09a 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.37.0-alpha20220415v03' - implementation 'com.finogeeks.mop:plugins:2.36.1' + implementation 'com.finogeeks.lib:finapplet:2.36.3' + implementation 'com.finogeeks.mop:plugins:2.36.3' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 9964153..8dec4ab 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.36.1' +version: '2.36.3' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 5fb308571408ae675c3e361b141ffabfd1a9b67d Mon Sep 17 00:00:00 2001 From: developer Date: Fri, 22 Apr 2022 22:51:12 +0800 Subject: [PATCH 15/15] release: version:2.36.3 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index fa7f579..6640dae 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.36.1' - s.dependency 'FinAppletExt' , '2.36.1' + s.dependency 'FinApplet' , '2.36.5' + s.dependency 'FinAppletExt' , '2.36.5' end