From 09461cb825075c6a084cb95d46b29c7931b3c3e8 Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 24 Jun 2021 17:32:58 +0800 Subject: [PATCH 01/12] release: version:2.30.1 --- 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 e5963b2..37c9bcc 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.29.3' - s.dependency 'FinAppletExt' , '2.29.3' + s.dependency 'FinApplet' , '2.30.1' + s.dependency 'FinAppletExt' , '2.30.1' end diff --git a/pubspec.yaml b/pubspec.yaml index 7273ec1..dc21a99 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.29.3' +version: '2.30.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 06cceac99bf0cd2da0f4ff8c2faaaa9fec0572fb Mon Sep 17 00:00:00 2001 From: developer Date: Thu, 24 Jun 2021 19:38:08 +0800 Subject: [PATCH 02/12] release: version:2.30.1 --- 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 e5963b2..37c9bcc 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.29.3' - s.dependency 'FinAppletExt' , '2.29.3' + s.dependency 'FinApplet' , '2.30.1' + s.dependency 'FinAppletExt' , '2.30.1' end diff --git a/pubspec.yaml b/pubspec.yaml index 7273ec1..dc21a99 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.29.3' +version: '2.30.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 0756e31d38c978c1e43a088045b9455c79b7c26d Mon Sep 17 00:00:00 2001 From: wangtao Date: Thu, 24 Jun 2021 20:24:37 +0800 Subject: [PATCH 03/12] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E8=AF=86=E5=88=AB=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=87=A1=E6=B3=B0=E5=B0=8F=E7=A8=8B=E5=BA=8Fid=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/.flutter-plugins-dependencies | 2 +- example/ios/Podfile.lock | 28 +----------- example/ios/Runner.xcodeproj/project.pbxproj | 25 +++------- example/pubspec.lock | 48 ++++++++++---------- ios/Classes/Api/MOP_parseWXQrCode.h | 18 ++++++++ ios/Classes/Api/MOP_parseWXQrCode.m | 25 ++++++++++ ios/mop.podspec | 4 +- lib/mop.dart | 7 +++ pubspec.lock | 44 +++++++++--------- 9 files changed, 106 insertions(+), 95 deletions(-) create mode 100644 ios/Classes/Api/MOP_parseWXQrCode.h create mode 100644 ios/Classes/Api/MOP_parseWXQrCode.m diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index c16385a..7e25aca 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-06-09 21:47:48.185375","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/edy/Documents/公司文档/Code/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/edy/Documents/公司文档/Code/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-06-24 18:01:19.402564","version":"2.2.1"} \ No newline at end of file diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock index 643596e..6dc2ef8 100644 --- a/example/ios/Podfile.lock +++ b/example/ios/Podfile.lock @@ -1,29 +1,3 @@ -PODS: - - FinApplet (2.12.3) - - Flutter (1.0.0) - - mop (0.1.0): - - FinApplet - - Flutter - -DEPENDENCIES: - - Flutter (from `.symlinks/flutter/ios`) - - mop (from `.symlinks/plugins/mop/ios`) - -SPEC REPOS: - https://git.finogeeks.club/finoapp-ios/FinPods: - - FinApplet - -EXTERNAL SOURCES: - Flutter: - :path: ".symlinks/flutter/ios" - mop: - :path: ".symlinks/plugins/mop/ios" - -SPEC CHECKSUMS: - FinApplet: a79f16c3f1e982a78b152544bc0d30add70068c6 - Flutter: 0e3d915762c693b495b44d77113d4970485de6ec - mop: e3eac9de90d3e331268e9c9e8308e233e540ad1c - PODFILE CHECKSUM: fa591ea0d89752dd0191ae3f82c83db034678e82 -COCOAPODS: 1.9.1 +COCOAPODS: 1.10.1 diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj index 4ade7ea..3bcf55a 100644 --- a/example/ios/Runner.xcodeproj/project.pbxproj +++ b/example/ios/Runner.xcodeproj/project.pbxproj @@ -150,7 +150,6 @@ 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, - 5938D4658D84E94E9BCEAF2A /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -224,21 +223,6 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; - 5938D4658D84E94E9BCEAF2A /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - name = "[CP] Embed Pods Frameworks"; - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -351,7 +335,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -372,6 +356,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -431,7 +416,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -480,7 +465,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -501,6 +486,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -526,6 +512,7 @@ "$(PROJECT_DIR)/Flutter", ); INFOPLIST_FILE = Runner/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", diff --git a/example/pubspec.lock b/example/pubspec.lock index c46bddd..0f7cf31 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -5,56 +5,56 @@ packages: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted - version: "2.5.0" + version: "2.6.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "2.1.0" characters: dependency: transitive description: name: characters - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.1.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.2.0" clock: dependency: transitive description: name: clock - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.1.0" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.15.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "0.1.3" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.2.0" flutter: @@ -71,14 +71,14 @@ packages: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "0.12.10" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.3.0" mop: @@ -87,12 +87,12 @@ packages: path: ".." relative: true source: path - version: "2.29.3" + version: "2.30.1" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.8.0" sky_engine: @@ -104,58 +104,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.2.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.3.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-0.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=1.10.0" diff --git a/ios/Classes/Api/MOP_parseWXQrCode.h b/ios/Classes/Api/MOP_parseWXQrCode.h new file mode 100644 index 0000000..80d757c --- /dev/null +++ b/ios/Classes/Api/MOP_parseWXQrCode.h @@ -0,0 +1,18 @@ +// +// MOP_parseWXQrCode.h +// mop +// +// Created by EDY on 2021/6/22. +// + +#import +#import "MOPBaseApi.h" + +NS_ASSUME_NONNULL_BEGIN + +@interface MOP_parseWXQrCode : MOPBaseApi +@property(nonatomic,copy)NSString* qrCode; //二维码url +@property(nonatomic,copy)NSString* apiServer; //服务器地址 +@end + +NS_ASSUME_NONNULL_END diff --git a/ios/Classes/Api/MOP_parseWXQrCode.m b/ios/Classes/Api/MOP_parseWXQrCode.m new file mode 100644 index 0000000..2f2e6c6 --- /dev/null +++ b/ios/Classes/Api/MOP_parseWXQrCode.m @@ -0,0 +1,25 @@ +// +// MOP_parseWXQrCode.m +// mop +// +// Created by EDY on 2021/6/22. +// + +#import "MOP_parseWXQrCode.h" +#import "MOPTools.h" +#import + +@implementation MOP_parseWXQrCode + +- (void)setupApiWithSuccess:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel { + NSLog(@"MOP_parseWXQrCode：%@", self.qrCode); + [[FATClient sharedClient] parseAppletInfoFromWXQrCode:self.qrCode apiServer:self.apiServer completion:^(NSDictionary *result, FATError *aError) { + if (aError) { + failure(aError.description); + }else{ + success(result); + } + }]; +} + +@end diff --git a/ios/mop.podspec b/ios/mop.podspec index 37c9bcc..be83077 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.30.1' - s.dependency 'FinAppletExt' , '2.30.1' + s.dependency 'FinApplet' , '2.31.0-alpha20210624v05' + s.dependency 'FinAppletExt' , '2.31.0-alpha20210624v05' end diff --git a/lib/mop.dart b/lib/mop.dart index 0b30f08..505fff8 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -164,6 +164,13 @@ class Mop { Map params = {'info': info}; return await _channel.invokeMapMethod("scanOpenApplet", params); } + + + Future> parseWXQrcode(String qrCode,String apiServer) async { + final ret = + await _channel.invokeMapMethod("parseWXQrCode", {"wxQrCode": qrCode,"apiServer":apiServer}); + return Map.from(ret); + } /// /// register handler to provide custom info or behaviour diff --git a/pubspec.lock b/pubspec.lock index c2442ac..ae675f0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,49 +5,49 @@ packages: dependency: transitive description: name: async - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted - version: "2.5.0" + version: "2.6.1" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "2.1.0" characters: dependency: transitive description: name: characters - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.1.0" charcode: dependency: transitive description: name: charcode - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.2.0" clock: dependency: transitive description: name: clock - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.1.0" collection: dependency: transitive description: name: collection - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.15.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.2.0" flutter: @@ -64,21 +64,21 @@ packages: dependency: transitive description: name: matcher - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "0.12.10" meta: dependency: transitive description: name: meta - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.3.0" path: dependency: transitive description: name: path - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.8.0" sky_engine: @@ -90,58 +90,58 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted - version: "1.8.0" + version: "1.8.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.2.0" test_api: dependency: transitive description: name: test_api - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted - version: "0.2.19" + version: "0.3.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "1.3.0" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.flutter-io.cn" + url: "https://mirrors.tuna.tsinghua.edu.cn/dart-pub" source: hosted version: "2.1.0" sdks: - dart: ">=2.12.0-0.0 <3.0.0" + dart: ">=2.12.0 <3.0.0" flutter: ">=1.10.0" From 0d169b9e1437af394eca0ca8c23c0c3f15fa7157 Mon Sep 17 00:00:00 2001 From: wangtao Date: Thu, 24 Jun 2021 20:54:02 +0800 Subject: [PATCH 04/12] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E5=BE=AE=E4=BF=A1?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=A0=81=E8=AF=86=E5=88=AB=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E5=87=A1=E6=B3=B0=E5=B0=8F=E7=A8=8B=E5=BA=8Fid?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._parseWXQrCode.h => MOP_parseAppletInfoFromWXQrCode.h} | 2 +- ..._parseWXQrCode.m => MOP_parseAppletInfoFromWXQrCode.m} | 4 ++-- ios/mop.podspec | 4 ++-- lib/mop.dart | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) rename ios/Classes/Api/{MOP_parseWXQrCode.h => MOP_parseAppletInfoFromWXQrCode.h} (84%) rename ios/Classes/Api/{MOP_parseWXQrCode.m => MOP_parseAppletInfoFromWXQrCode.m} (87%) diff --git a/ios/Classes/Api/MOP_parseWXQrCode.h b/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.h similarity index 84% rename from ios/Classes/Api/MOP_parseWXQrCode.h rename to ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.h index 80d757c..904f380 100644 --- a/ios/Classes/Api/MOP_parseWXQrCode.h +++ b/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.h @@ -10,7 +10,7 @@ NS_ASSUME_NONNULL_BEGIN -@interface MOP_parseWXQrCode : MOPBaseApi +@interface MOP_parseAppletInfoFromWXQrCode : MOPBaseApi @property(nonatomic,copy)NSString* qrCode; //二维码url @property(nonatomic,copy)NSString* apiServer; //服务器地址 @end diff --git a/ios/Classes/Api/MOP_parseWXQrCode.m b/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m similarity index 87% rename from ios/Classes/Api/MOP_parseWXQrCode.m rename to ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m index 2f2e6c6..700d49f 100644 --- a/ios/Classes/Api/MOP_parseWXQrCode.m +++ b/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m @@ -5,11 +5,11 @@ // Created by EDY on 2021/6/22. // -#import "MOP_parseWXQrCode.h" +#import "MOP_parseAppletInfoFromWXQrCode.h" #import "MOPTools.h" #import -@implementation MOP_parseWXQrCode +@implementation MOP_parseAppletInfoFromWXQrCode - (void)setupApiWithSuccess:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel { NSLog(@"MOP_parseWXQrCode：%@", self.qrCode); diff --git a/ios/mop.podspec b/ios/mop.podspec index 0092394..798adb0 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -16,7 +16,7 @@ A finclip miniprogram flutter sdk. s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.30.1' - s.dependency 'FinAppletExt' , '2.30.1' + s.dependency 'FinApplet' , '2.31.0-alpha20210624v05' + s.dependency 'FinAppletExt' , '2.31.0-alpha20210624v05' end diff --git a/lib/mop.dart b/lib/mop.dart index 505fff8..524639e 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -164,11 +164,11 @@ class Mop { Map params = {'info': info}; return await _channel.invokeMapMethod("scanOpenApplet", params); } - - Future> parseWXQrcode(String qrCode,String apiServer) async { - final ret = - await _channel.invokeMapMethod("parseWXQrCode", {"wxQrCode": qrCode,"apiServer":apiServer}); + Future> parseAppletInfoFromWXQrCode( + String qrCode, String apiServer) async { + final ret = await _channel.invokeMapMethod("parseAppletInfoFromWXQrCode", + {"qrCode": qrCode, "apiServer": apiServer}); return Map.from(ret); } From 1b42b67e2ecf24504d649f98c6a20a9e7e30e324 Mon Sep 17 00:00:00 2001 From: developer Date: Fri, 25 Jun 2021 08:57:09 +0800 Subject: [PATCH 05/12] release: version:2.30.1 --- 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 e5963b2..37c9bcc 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.29.3' - s.dependency 'FinAppletExt' , '2.29.3' + s.dependency 'FinApplet' , '2.30.1' + s.dependency 'FinAppletExt' , '2.30.1' end diff --git a/pubspec.yaml b/pubspec.yaml index 7273ec1..dc21a99 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.29.3' +version: '2.30.1' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 4b5aeca2b6f53bbf60c8fa2c05d4ab2ed9eac9ef Mon Sep 17 00:00:00 2001 From: yangbingqiao Date: Fri, 25 Jun 2021 09:44:20 +0800 Subject: [PATCH 06/12] =?UTF-8?q?Android=E7=AB=AF=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=B5=8B=E8=AF=95=E7=89=88=EF=BC=9A?= =?UTF-8?q?2.31.0-alpha20210625v01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 978f32a..270a1b7 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.30.1' + implementation 'com.finogeeks.lib:finapplet:2.31.0-alpha20210625v01' implementation 'com.finogeeks.mop:plugins:2.30.2' } \ No newline at end of file From a7bbacbd47fc40a39e1e1c2db48cccc30bb7f29e Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 25 Jun 2021 13:30:34 +0800 Subject: [PATCH 07/12] =?UTF-8?q?android:=E6=96=B0=E5=A2=9E=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=BE=AE=E4=BF=A1QrCode=E4=BF=A1=E6=81=AF=E8=A7=A3?= =?UTF-8?q?=E6=9E=90=E5=B0=8F=E7=A8=8B=E5=BA=8F=E4=BF=A1=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- .../com/finogeeks/mop/api/ApisManager.java | 2 + .../finogeeks/mop/api/mop/WXQrCodeModule.java | 48 +++++++++++++++++++ lib/mop.dart | 3 ++ 4 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 android/src/main/java/com/finogeeks/mop/api/mop/WXQrCodeModule.java diff --git a/android/build.gradle b/android/build.gradle index 270a1b7..f18015d 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.31.0-alpha20210625v01' + implementation 'com.finogeeks.lib:finapplet:2.31.0-alpha20210624v06' implementation 'com.finogeeks.mop:plugins:2.30.2' } \ No newline at end of file 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 39bdfee..168793e 100644 --- a/android/src/main/java/com/finogeeks/mop/api/ApisManager.java +++ b/android/src/main/java/com/finogeeks/mop/api/ApisManager.java @@ -10,6 +10,7 @@ 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.api.mop.WXQrCodeModule; import com.finogeeks.mop.interfaces.Event; import com.finogeeks.mop.interfaces.IApi; @@ -71,6 +72,7 @@ public class ApisManager { add(new ExtensionApiModule(activity)); add(new VersionModule(activity)); add(new SmSignModule(activity)); + add(new WXQrCodeModule(activity)); } private void add(IApi api) { diff --git a/android/src/main/java/com/finogeeks/mop/api/mop/WXQrCodeModule.java b/android/src/main/java/com/finogeeks/mop/api/mop/WXQrCodeModule.java new file mode 100644 index 0000000..2fc0174 --- /dev/null +++ b/android/src/main/java/com/finogeeks/mop/api/mop/WXQrCodeModule.java @@ -0,0 +1,48 @@ +package com.finogeeks.mop.api.mop; + +import android.content.Context; + +import com.finogeeks.lib.applet.client.FinAppClient; +import com.finogeeks.lib.applet.modules.callback.FinSimpleCallback; +import com.finogeeks.lib.applet.sdk.model.ParsedAppletInfo; +import com.finogeeks.mop.api.BaseApi; +import com.finogeeks.mop.interfaces.ICallback; + +import org.jetbrains.annotations.Nullable; + +import java.util.HashMap; +import java.util.Map; + +public class WXQrCodeModule extends BaseApi { + + public WXQrCodeModule(Context context) { + super(context); + } + + @Override + public String[] apis() { + return new String[]{"parseAppletInfoFromWXQrCode"}; + } + + @Override + public void invoke(String event, Map param, ICallback callback) { + String qrCode = (String) param.get("qrCode"); + String apiServer = (String) param.get("apiServer"); + FinAppClient.INSTANCE.getAppletApiManager().parseAppletInfoFromWXQrCode( + qrCode, + apiServer, + new FinSimpleCallback() { + @Override + public void onSuccess(ParsedAppletInfo appletInfo) { + HashMap map = new HashMap<>(); + map.put("appId", appletInfo != null ? appletInfo.getAppId() : null); + callback.onSuccess(map); + } + + @Override + public void onError(int code, @Nullable String error) { + callback.onFail(code + ", " + error); + } + }); + } +} diff --git a/lib/mop.dart b/lib/mop.dart index 524639e..aa0f70f 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -165,6 +165,9 @@ class Mop { return await _channel.invokeMapMethod("scanOpenApplet", params); } + /// + /// 根据微信QrCode信息解析小程序信息 + /// Future> parseAppletInfoFromWXQrCode( String qrCode, String apiServer) async { final ret = await _channel.invokeMapMethod("parseAppletInfoFromWXQrCode", From 515c2b4744cf1c9ba2c870b06bec3e4d6f61d07e Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 28 Jun 2021 09:36:36 +0800 Subject: [PATCH 08/12] =?UTF-8?q?userId=E4=B8=BA=E7=A9=BA=E6=83=85?= =?UTF-8?q?=E5=86=B5=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 6c95d06..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 @@ -59,7 +59,7 @@ public class BaseModule extends BaseApi { if (disablePermission == null) { disablePermission = false; } - String userId = null; + String userId = ""; if (param.get("userId") != null) { userId = (String) param.get("userId"); } From fdba96465c442089c8e1b6f21a60dce50f710dc5 Mon Sep 17 00:00:00 2001 From: wangtao Date: Mon, 28 Jun 2021 10:17:27 +0800 Subject: [PATCH 09/12] =?UTF-8?q?fix:iOS=E4=B8=80=E7=A0=81=E9=80=9A?= =?UTF-8?q?=E7=9A=84=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C=E6=94=B9=E6=88=90?= =?UTF-8?q?model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m | 8 ++++++-- ios/mop.podspec | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m b/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m index 700d49f..ccce5ce 100644 --- a/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m +++ b/ios/Classes/Api/MOP_parseAppletInfoFromWXQrCode.m @@ -13,11 +13,15 @@ - (void)setupApiWithSuccess:(void (^)(NSDictionary * _Nonnull))success failure:(void (^)(id _Nullable))failure cancel:(void (^)(void))cancel { NSLog(@"MOP_parseWXQrCode：%@", self.qrCode); - [[FATClient sharedClient] parseAppletInfoFromWXQrCode:self.qrCode apiServer:self.apiServer completion:^(NSDictionary *result, FATError *aError) { + [[FATClient sharedClient] parseAppletInfoFromWXQrCode:self.qrCode apiServer:self.apiServer completion:^(FATAppletSimpleInfo *appInfo, FATError *aError) { if (aError) { failure(aError.description); }else{ - success(result); + NSMutableDictionary *dataDic = [[NSMutableDictionary alloc]init]; + if (appInfo && appInfo.appId) { + [dataDic setObject:appInfo.appId forKey:@"appId"]; + } + success(dataDic); } }]; } diff --git a/ios/mop.podspec b/ios/mop.podspec index 798adb0..320009d 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -16,7 +16,7 @@ A finclip miniprogram flutter sdk. s.public_header_files = 'Classes/**/*.h' s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.31.0-alpha20210624v05' - s.dependency 'FinAppletExt' , '2.31.0-alpha20210624v05' + s.dependency 'FinApplet' , '2.31.0-alpha20210628v02' + s.dependency 'FinAppletExt' , '2.31.0-alpha20210628v02' end From 7ee1b76f0d430a5deb3f4a8232d347ba477d27e1 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 28 Jun 2021 16:52:34 +0800 Subject: [PATCH 10/12] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index f18015d..b187144 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.31.0-alpha20210624v06' + implementation 'com.finogeeks.lib:finapplet:2.31.0-alpha20210628v01' implementation 'com.finogeeks.mop:plugins:2.30.2' } \ No newline at end of file From 873f4a6085a7a34055d23f5f0b48e48daf8807b8 Mon Sep 17 00:00:00 2001 From: yangbingqiao Date: Mon, 28 Jun 2021 18:02:06 +0800 Subject: [PATCH 11/12] =?UTF-8?q?Android=E7=AB=AF=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=B5=8B=E8=AF=95=E7=89=88=EF=BC=9A?= =?UTF-8?q?2.31.0-alpha20210628v02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index b187144..9f339c4 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.31.0-alpha20210628v01' + implementation 'com.finogeeks.lib:finapplet:2.31.0-alpha20210628v02' implementation 'com.finogeeks.mop:plugins:2.30.2' } \ No newline at end of file From c78060143496da3510865d8c63f65ccb4c1dfa12 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Tue, 29 Jun 2021 11:16:14 +0800 Subject: [PATCH 12/12] version++ --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 9f339c4..e0675e1 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.31.0-alpha20210628v02' + implementation 'com.finogeeks.lib:finapplet:2.31.0-alpha20210629v01' implementation 'com.finogeeks.mop:plugins:2.30.2' } \ No newline at end of file