From f3564f51679d7f349dfa1d558845d31800fa50c0 Mon Sep 17 00:00:00 2001 From: wangtao Date: Wed, 12 Jan 2022 20:25:37 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E5=8E=BB=E6=8E=89iOS=E9=9B=86?= =?UTF-8?q?=E6=88=90=E5=9C=B0=E5=9B=BE=E5=92=8Cwebrtc=E7=9A=84=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 7 +++---- ios/mop.podspec | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 52ce818..b5b17ab 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -9,7 +9,6 @@ #import #import #import "MOPTools.h" -// #import @implementation MOP_initialize @@ -128,11 +127,11 @@ return; } // [[FATExtClient sharedClient] fat_prepareExtensionApis]; -// [[FATExtClient sharedClient] fat_UsingMapType:@"FATExtMapStyleGD" MapKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; + + - // [FATGDMapComponent setGDMapAppKey:@"6f0f28c4138cbaa51aa5890e26996ea2"]; [[FATClient sharedClient] setEnableLog:YES]; - // [FATWebRTCComponent registerComponent]; + success(@{}); diff --git a/ios/mop.podspec b/ios/mop.podspec index b4819ee..25d390c 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.1' - s.dependency 'FinAppletExt' , '2.35.1' + s.dependency 'FinApplet' , '2.36.0-alpha20220112v04' + s.dependency 'FinAppletExt' , '2.36.0-alpha20220112v04' end From 3a968f65efa1a7b259f4130cd253a218dede2b61 Mon Sep 17 00:00:00 2001 From: jizelin Date: Fri, 14 Jan 2022 17:37:57 +0800 Subject: [PATCH 2/8] version --- example/pubspec.lock | 2 +- ios/mop.podspec | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/example/pubspec.lock b/example/pubspec.lock index bacf03e..fee249a 100644 --- a/example/pubspec.lock +++ b/example/pubspec.lock @@ -108,7 +108,7 @@ packages: path: ".." relative: true source: path - version: "2.34.12" + version: "2.35.1" path: dependency: transitive description: diff --git a/ios/mop.podspec b/ios/mop.podspec index 25d390c..f9a9ac3 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,7 +17,8 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.36.0-alpha20220112v04' - s.dependency 'FinAppletExt' , '2.36.0-alpha20220112v04' + s.dependency 'FinApplet' , '2.36.0-alpha20220114v09' + s.dependency 'FinAppletExt' , '2.36.0-alpha20220114v09' + end From dd683a1d53a3c2ec877007e2ea1ceaee0a9edea8 Mon Sep 17 00:00:00 2001 From: wangtao Date: Fri, 14 Jan 2022 20:49:48 +0800 Subject: [PATCH 3/8] =?UTF-8?q?fix:=20=E6=8F=90=E7=A4=BA=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_callJS.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Classes/Api/MOP_callJS.m b/ios/Classes/Api/MOP_callJS.m index 07be0e4..be79f59 100644 --- a/ios/Classes/Api/MOP_callJS.m +++ b/ios/Classes/Api/MOP_callJS.m @@ -19,7 +19,7 @@ NSNumber *numberId = @(_nativeViewId.integerValue); [[FATClient sharedClient].nativeViewManager sendEvent:_eventName nativeViewId:numberId detail:_eventData completion:^(id result, NSError *error) { if (error) { - failure(@{@"errMsg": @"sendCustomEvent:fail"}); + failure(@{@"errMsg": @"callJS:fail"}); } else { success(result); } From 966b54166520237e3ff5c22dd8476f586b6a6a67 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 14 Jan 2022 21:06:49 +0800 Subject: [PATCH 4/8] version++ --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 0133d19..3d56589 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.35.1' +version: '2.35.3' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 3dc06540a27dedb580434fa4b60c4826527573a5 Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Fri, 14 Jan 2022 21:14:58 +0800 Subject: [PATCH 5/8] =?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 30d5449..488220c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -92,6 +92,6 @@ kapt { } dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.finogeeks.lib:finapplet:2.35.1' - implementation 'com.finogeeks.mop:plugins:2.35.1' + implementation 'com.finogeeks.lib:finapplet:2.35.3' + implementation 'com.finogeeks.mop:plugins:2.35.3' } \ No newline at end of file From 13c684fc5571cb91d8f2147697e234ad0f1c5cbc Mon Sep 17 00:00:00 2001 From: developer Date: Fri, 14 Jan 2022 21:41:22 +0800 Subject: [PATCH 6/8] release: version:2.35.3 --- ios/mop.podspec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index f9a9ac3..7226e91 100644 --- a/ios/mop.podspec +++ b/ios/mop.podspec @@ -17,8 +17,7 @@ A finclip miniprogram flutter sdk. s.dependency 'Flutter' s.ios.deployment_target = '9.0' - s.dependency 'FinApplet' , '2.36.0-alpha20220114v09' - s.dependency 'FinAppletExt' , '2.36.0-alpha20220114v09' - + s.dependency 'FinApplet' , '2.35.3' + s.dependency 'FinAppletExt' , '2.35.3' end From 8843c246a5b3cd355b86432e7585f76cc1f494ac Mon Sep 17 00:00:00 2001 From: jizelin Date: Fri, 14 Jan 2022 22:59:07 +0800 Subject: [PATCH 7/8] =?UTF-8?q?iOS=20major=E6=AD=A3=E5=BC=8F=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 7226e91..71f2ca3 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.3' - s.dependency 'FinAppletExt' , '2.35.3' + s.dependency 'FinApplet' , '2.36.0-alpha20220114v13' + s.dependency 'FinAppletExt' , '2.36.0-alpha20220114v13' end From ff469d9032e6749f643cb5f39350a5b7c3b23313 Mon Sep 17 00:00:00 2001 From: kangxuyao Date: Mon, 17 Jan 2022 15:19:11 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mop.dart | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/lib/mop.dart b/lib/mop.dart index af3f1b1..df9a0e4 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -82,8 +82,10 @@ class UIConfig { //iOS中独有的设置属性 //小程序里加载H5页面时进度条的颜色 格式 0xFFFFAA00 int? progressBarColor; + //是否自适应暗黑模式。如果设置为true，则更多页面、关于等原生页面会随着手机切换暗黑，也自动调整为暗黑模式 bool autoAdaptDarkMode = true; + //注入小程序统称appletText字符串，默认为“小程序”。 String? appletText; @@ -421,6 +423,10 @@ class Mop { return await _channel.invokeMapMethod("scanOpenApplet", params); } + /// + /// 通过二维码打开小程序 + /// [qrcode] 二维码内容 + /// Future qrcodeOpenApplet(String qrcode) async { Map params = {'qrcode': qrcode}; return await _channel.invokeMapMethod("qrcodeOpenApplet", params); @@ -495,28 +501,36 @@ class Mop { return; } - //关闭小程序 小程序会在内存中存在 + /// + /// 关闭小程序 小程序会在内存中存在 + /// Future closeApplet(String appletId, bool animated) async { await _channel.invokeMethod( "closeApplet", {"appletId": appletId, "animated": animated}); return; } - //结束小程序 小程序会从内存中清除 + /// + /// 结束小程序 小程序会从内存中清除 + /// Future finishRunningApplet(String appletId, bool animated) async { await _channel.invokeMethod( "finishRunningApplet", {"appletId": appletId, "animated": animated}); return; } - //设置小程序切换动画 安卓 + /// + /// 设置小程序切换动画 安卓 + /// Future setActivityTransitionAnim(Anim anim) async { await _channel .invokeMethod("setActivityTransitionAnim", {"anim": anim.name}); return; } - - //发送事件给小程序 + /// + /// 原生发送事件给小程序 + /// [appId] 小程序id + /// [eventData] 事件对象 Future sendCustomEvent( String appId, Map eventData) async { await _channel.invokeMethod( @@ -524,7 +538,13 @@ class Mop { return; } - //原生调用js + /// + /// 原生调用webview中的js方法 + /// [appId] 小程序id + /// [eventName] 方法名 + /// [nativeViewId] webviewId + /// [eventData] 参数 + /// Future callJS(String appId, String eventName, String nativeViewId, Map eventData) async { await _channel.invokeMethod("callJS", { @@ -536,7 +556,10 @@ class Mop { return; } - //注册h5的拓展接口 + /// + /// register webview extension api + /// 注册webview拓展api + /// void addWebExtentionApi(String name, ExtensionApiHandler handler) { _webExtensionApis[name] = handler; _channel.invokeMethod("addWebExtentionApi", {"name": name});