From fe1501aabfb79fcab07ed60feb9dce993ee152f8 Mon Sep 17 00:00:00 2001 From: developer Date: Mon, 28 Nov 2022 09:33:23 +0800 Subject: [PATCH 01/10] release: version:2.38.9 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 365f8d0..07f7084 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.38.7' - s.dependency 'FinAppletExt' , '2.38.7' + s.dependency 'FinApplet' , '2.38.9' + s.dependency 'FinAppletExt' , '2.38.9' end From abb51a036429885b77bdbb139f6e0a0ebe3bbae5 Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Wed, 7 Dec 2022 16:35:48 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 3d23de6..f2d636a 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.38.9' - implementation 'com.finogeeks.mop:plugins:2.38.9' + implementation 'com.finogeeks.lib:finapplet:2.38.10-alpha20221207v05' + implementation 'com.finogeeks.mop:plugins:2.38.10-alpha20221207v05' } \ No newline at end of file From 68069af2b673408446fb11109d76d3e713807638 Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Fri, 9 Dec 2022 11:16:46 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 4 +-- .../com/finogeeks/mop/utils/AppletUtils.java | 33 +++++++------------ 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index f2d636a..2a58dab 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.38.10-alpha20221207v05' - implementation 'com.finogeeks.mop:plugins:2.38.10-alpha20221207v05' + implementation 'com.finogeeks.lib:finapplet:2.38.10-alpha20221209v01' + implementation 'com.finogeeks.mop:plugins:2.38.10-alpha20221209v01' } \ No newline at end of file diff --git a/android/src/main/java/com/finogeeks/mop/utils/AppletUtils.java b/android/src/main/java/com/finogeeks/mop/utils/AppletUtils.java index 8c3d6ab..6306111 100644 --- a/android/src/main/java/com/finogeeks/mop/utils/AppletUtils.java +++ b/android/src/main/java/com/finogeeks/mop/utils/AppletUtils.java @@ -1,38 +1,29 @@ package com.finogeeks.mop.utils; -import android.app.PendingIntent; import android.content.Context; -import android.content.Intent; -import android.text.TextUtils; import com.finogeeks.lib.applet.client.FinAppClient; +import com.finogeeks.lib.applet.client.FinAppProcessClient; +import com.finogeeks.lib.applet.main.FinAppHomeActivity; import com.finogeeks.mop.interfaces.ICallback; public class AppletUtils { public static void moveCurrentAppletToFront(Context context, ICallback callback) { try { - String currentAppletId = FinAppClient.INSTANCE.getAppletApiManager().getCurrentAppletId(); - if (currentAppletId == null || TextUtils.isEmpty(currentAppletId)) { - if (callback != null) { - callback.onFail(null); + if (FinAppClient.INSTANCE.isFinAppProcess(context)) { + FinAppHomeActivity activity = (FinAppHomeActivity) FinAppProcessClient.INSTANCE.getAppletProcessActivity(); + if (activity != null) { + activity.moveTaskToFront(); } - return; - } - String activityName = FinAppClient.INSTANCE.getAppletApiManager().getAppletActivityName(currentAppletId); - if (activityName == null) { - if (callback != null) { - callback.onFail(null); + } else { + String currentAppletId = FinAppClient.INSTANCE.getAppletApiManager().getCurrentAppletId(); + if (currentAppletId != null) { + FinAppClient.INSTANCE.getAppletApiManager().moveTaskToFront(currentAppletId); } - return; } - if (activityName.contains("@")) { - activityName = activityName.substring(0, activityName.indexOf("@")); + if (callback != null) { + callback.onSuccess(null); } - Intent intent = new Intent(context, Class.forName(activityName)); - intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - PendingIntent pendingIntent = PendingIntent.getActivities(context, 0, new Intent[]{intent}, 0); - pendingIntent.send(); - callback.onSuccess(null); } catch (Exception e) { e.printStackTrace(); if (callback != null) { From 9d018623b1547e7bdab3949681871a6df7d61670 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 9 Dec 2022 22:34:51 +0800 Subject: [PATCH 04/10] 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 3d23de6..021eef6 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.38.9' - implementation 'com.finogeeks.mop:plugins:2.38.9' + implementation 'com.finogeeks.lib:finapplet:2.38.11' + implementation 'com.finogeeks.mop:plugins:2.38.11' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 6551acb..0f2d183 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.38.9' +version: '2.38.11' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From bb6e4088ab209e742b4b9ae42bb874acbe9604d9 Mon Sep 17 00:00:00 2001 From: gaoyunfei Date: Fri, 9 Dec 2022 23:01:11 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0SDK=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 2a58dab..021eef6 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.38.10-alpha20221209v01' - implementation 'com.finogeeks.mop:plugins:2.38.10-alpha20221209v01' + implementation 'com.finogeeks.lib:finapplet:2.38.11' + implementation 'com.finogeeks.mop:plugins:2.38.11' } \ No newline at end of file From 032081275018fb7d32550f2ec579c864ced4afe2 Mon Sep 17 00:00:00 2001 From: developer Date: Sun, 11 Dec 2022 17:33:06 +0800 Subject: [PATCH 06/10] release: version:2.38.11 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 07f7084..2338ecb 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.38.9' - s.dependency 'FinAppletExt' , '2.38.9' + s.dependency 'FinApplet' , '2.38.11' + s.dependency 'FinAppletExt' , '2.38.11' end From 128d81ae0b47ba1c55958316c9741a9d71cb0167 Mon Sep 17 00:00:00 2001 From: wanghualei Date: Thu, 22 Dec 2022 14:11:16 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix=20api=E8=BF=94=E5=9B=9Enil=20?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=B4=A9=E6=BA=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/MopPlugin.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/MopPlugin.m b/ios/Classes/MopPlugin.m index f1821b5..29e640e 100644 --- a/ios/Classes/MopPlugin.m +++ b/ios/Classes/MopPlugin.m @@ -93,7 +93,7 @@ static MopPlugin *_instance; MOPBaseApi* api = [MOPApiConverter apiWithRequest: request]; if (api) { [api setupApiWithSuccess:^(NSDictionary * _Nonnull data) { - result(@{@"retMsg":@"ok",@"success":@(YES),@"data": data}); + result(@{@"retMsg":@"ok",@"success":@(YES),@"data": data ? : @{}}); } failure:^(id _Nullable error) { if ([error isKindOfClass:[NSDictionary class]]) { NSDictionary* dict = (NSDictionary*)error; From deb6abf1ab9de7e8d9796d857184673b9b30e520 Mon Sep 17 00:00:00 2001 From: jizelin Date: Fri, 23 Dec 2022 17:20:25 +0800 Subject: [PATCH 08/10] =?UTF-8?q?feat=EF=BC=9A=E5=AE=9E=E7=8E=B0copyFileAs?= =?UTF-8?q?FinFile=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/MopPlugin.m | 8 ++++++++ ios/mop.podspec | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ios/Classes/MopPlugin.m b/ios/Classes/MopPlugin.m index 29e640e..dc760ea 100644 --- a/ios/Classes/MopPlugin.m +++ b/ios/Classes/MopPlugin.m @@ -76,6 +76,14 @@ static MopPlugin *_instance; dict[@"path"] = [[FATClient sharedClient] fat_absolutePathWithPath:path]; result(dict); } + else if ([@"copyFileAsFinFile" isEqualToString:call.method]) { + NSString *appId = call.arguments[@"appId"]; + NSString *path = call.arguments[@"path"]; + NSString *fileName = [path componentsSeparatedByString:@"/"].lastObject; + NSMutableDictionary *dict = [NSMutableDictionary dictionary]; + dict[@"path"] = [[FATClient sharedClient] saveFile:[NSData dataWithContentsOfFile:path] fileName:fileName]; + result(dict); + } else if ([@"getPhoneNumberResult" isEqualToString:call.method]) { if ([MOPAppletDelegate instance].bindGetPhoneNumbers) { NSDictionary *dic = [[NSDictionary alloc] initWithDictionary:call.arguments]; diff --git a/ios/mop.podspec b/ios/mop.podspec index 2338ecb..fc53cb3 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.38.11' - s.dependency 'FinAppletExt' , '2.38.11' + s.dependency 'FinApplet' , '2.39.0-alpha20221223v06' + s.dependency 'FinAppletExt' , '2.39.0-alpha20221223v06' end From 9f2253c9301ff0e544df6d74137148425f0eaff2 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 23 Dec 2022 23:57:07 +0800 Subject: [PATCH 09/10] 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 021eef6..6fbba11 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.38.11' - implementation 'com.finogeeks.mop:plugins:2.38.11' + implementation 'com.finogeeks.lib:finapplet:2.39.1' + implementation 'com.finogeeks.mop:plugins:2.39.1' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 0f2d183..097cbb1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.38.11' +version: '2.39.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From b9a977fe583df4903a8fdce908c3aa4983b83c5f Mon Sep 17 00:00:00 2001 From: developer Date: Tue, 27 Dec 2022 11:59:41 +0800 Subject: [PATCH 10/10] release: version:2.39.1 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index fc53cb3..16dc9c9 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.39.0-alpha20221223v06' - s.dependency 'FinAppletExt' , '2.39.0-alpha20221223v06' + s.dependency 'FinApplet' , '2.39.1' + s.dependency 'FinAppletExt' , '2.39.1' end