From c797fd0c90a5959509b3578970b9612750915923 Mon Sep 17 00:00:00 2001 From: jizelin Date: Thu, 30 Dec 2021 16:16:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=8A=A9=E6=89=8B?= =?UTF-8?q?=E8=8F=9C=E5=8D=95getCustomMenus=E8=BF=94=E5=9B=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=B8=8D=E4=B8=BANSArray=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example/.flutter-plugins-dependencies | 2 +- example/pubspec.lock | 2 +- ios/Classes/Api/MOPAppletDelegate.m | 4 +++- ios/mop.podspec | 8 ++++---- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index ec9321b..64b440d 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/haley/Documents/Finogeeks/Gitlab/finclip-flutter-sdk/","dependencies":[]}],"android":[{"name":"mop","path":"/Users/haley/Documents/Finogeeks/Gitlab/finclip-flutter-sdk/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[]},"dependencyGraph":[{"name":"mop","dependencies":[]}],"date_created":"2021-12-29 10:07:33.662750","version":"2.3.0-1.0.pre.169"} \ 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/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-12-30 16:09:08.189707","version":"2.2.2"} \ No newline at end of file diff --git a/example/pubspec.lock b/example/pubspec.lock index 310124c..4d1da1d 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -87,7 +87,7 @@ packages: path: ".." relative: true source: path - version: "2.34.5" + version: "2.34.12" path: dependency: transitive description: diff --git a/ios/Classes/Api/MOPAppletDelegate.m b/ios/Classes/Api/MOPAppletDelegate.m index 4a210d9..7ef475c 100644 --- a/ios/Classes/Api/MOPAppletDelegate.m +++ b/ios/Classes/Api/MOPAppletDelegate.m @@ -61,7 +61,9 @@ FlutterMethodChannel *channel = [[MopPlugin instance] methodChannel]; [channel invokeMethod:@"extensionApi:getCustomMenus" arguments:@{@"appId": appletInfo.appId} result:^(id _Nullable result) { CFRunLoopStop(CFRunLoopGetMain()); - list = result; + if ([result isKindOfClass:[NSArray class]]) { + list = result; + } }]; CFRunLoopRun(); diff --git a/ios/mop.podspec b/ios/mop.podspec index c01b846..4c50e34 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,10 +17,10 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.35.0-alpha20211229v14' - s.dependency 'FinAppletExt' , '2.35.0-alpha20211229v14' - s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211229v14' - s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211229v14' + s.dependency 'FinApplet' , '2.35.0-alpha20211230v01' + s.dependency 'FinAppletExt' , '2.35.0-alpha20211230v01' + s.dependency 'FinAppletGDMap' , '2.35.0-alpha20211230v01' + s.dependency 'FinAppletWebRTC' , '2.35.0-alpha20211230v01' end