From 4e020476307a42ef8b195ca5848ca8e2dc028a74 Mon Sep 17 00:00:00 2001 From: wangzhaoyao Date: Fri, 24 Feb 2023 13:40:30 +0800 Subject: [PATCH 01/13] 1.update --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 3481d07..d2555ed 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.7' - s.dependency 'FinAppletExt' , '2.39.7' + s.dependency 'FinApplet' , '2.40.0-dev20230223v10' + s.dependency 'FinAppletExt' , '2.40.0-dev20230223v10' end From 1255bbbcb4755e12cf09a1e6cf988543b14ce5d3 Mon Sep 17 00:00:00 2001 From: jenkins Date: Sat, 25 Feb 2023 00:20:26 +0800 Subject: [PATCH 02/13] 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 54f6df1..fe70af9 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.39.7' - implementation 'com.finogeeks.mop:plugins:2.39.7' + implementation 'com.finogeeks.lib:finapplet:2.39.9' + implementation 'com.finogeeks.mop:plugins:2.39.9' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 7b432b5..595fcbc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.39.7' +version: '2.39.9' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 8caedde08b6e1f054a5871a17bed78697e4dcf54 Mon Sep 17 00:00:00 2001 From: developer Date: Sat, 25 Feb 2023 16:36:23 +0800 Subject: [PATCH 03/13] release: version:2.39.9 --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 3481d07..e24a1c1 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.7' - s.dependency 'FinAppletExt' , '2.39.7' + s.dependency 'FinApplet' , '2.39.9' + s.dependency 'FinAppletExt' , '2.39.9' end From 8a34133ac495454f8e49365bd2d3fe5a5b799783 Mon Sep 17 00:00:00 2001 From: wangzhaoyao Date: Tue, 28 Feb 2023 09:07:30 +0800 Subject: [PATCH 04/13] 1.update version --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index d2555ed..1e0d9aa 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.40.0-dev20230223v10' - s.dependency 'FinAppletExt' , '2.40.0-dev20230223v10' + s.dependency 'FinApplet' , '2.40.0-dev20230227v03' + s.dependency 'FinAppletExt' , '2.40.0-dev20230227v03' end From 1c3dea3f525921f52bfdee026a012b9499a6d07a Mon Sep 17 00:00:00 2001 From: wangzhaoyao Date: Wed, 1 Mar 2023 17:30:41 +0800 Subject: [PATCH 05/13] 1.update --- ios/mop.podspec | 4 ++-- lib/mop.dart | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 1e0d9aa..51be96c 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.40.0-dev20230227v03' - s.dependency 'FinAppletExt' , '2.40.0-dev20230227v03' + s.dependency 'FinApplet' , '2.40.0-dev20230228v02' + s.dependency 'FinAppletExt' , '2.40.0-dev20230228v02' end diff --git a/lib/mop.dart b/lib/mop.dart index e70d79e..2f18283 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -588,20 +588,20 @@ class Mop { _appletHandlerApis["getUserInfo"] = (params) { return handler.getUserInfo(); }; - _appletHandlerApis["getCustomMenus"] = (params) async { - final res = await handler.getCustomMenus(params["appId"]); - List> list = []; - res.forEach((element) { - Map map = Map(); - map["menuId"] = element.menuId; - map["image"] = element.image; - map["title"] = element.title; - map["type"] = element.type; - list.add(map); - }); - debugPrint("registerAppletHandler getCustomMenus list $list"); - return list; - }; + // _appletHandlerApis["getCustomMenus"] = (params) async { + // final res = await handler.getCustomMenus(params["appId"]); + // List> list = []; + // res.forEach((element) { + // Map map = Map(); + // map["menuId"] = element.menuId; + // map["image"] = element.image; + // map["title"] = element.title; + // map["type"] = element.type; + // list.add(map); + // }); + // debugPrint("registerAppletHandler getCustomMenus list $list"); + // return list; + // }; _appletHandlerApis["onCustomMenuClick"] = (params) async { return handler.onCustomMenuClick( params["appId"], From 5839611a50e4ce2001a2bd9e642c67973657f8e7 Mon Sep 17 00:00:00 2001 From: wangzhaoyao Date: Thu, 9 Mar 2023 09:58:59 +0800 Subject: [PATCH 06/13] 1.update version --- ios/mop.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/mop.podspec b/ios/mop.podspec index 51be96c..d1f9240 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.40.0-dev20230228v02' - s.dependency 'FinAppletExt' , '2.40.0-dev20230228v02' + s.dependency 'FinApplet' , '2.40.0-dev20230308v04' + s.dependency 'FinAppletExt' , '2.40.0-dev20230308v04' end From 04ee35c146e5e32843353663d138e93df01a0894 Mon Sep 17 00:00:00 2001 From: wangzhaoyao Date: Thu, 9 Mar 2023 18:54:56 +0800 Subject: [PATCH 07/13] =?UTF-8?q?1.=E6=98=BE=E7=A4=BA=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index f75a922..18732cd 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -78,6 +78,7 @@ NSError* error = nil; FATUIConfig *uiconfig = [[FATUIConfig alloc]init]; uiconfig.autoAdaptDarkMode = YES; + uiconfig.hideShareAppletMenu = NO; if (_uiConfig) { if (_uiConfig[@"navigationTitleTextAttributes"]) { uiconfig.navigationTitleTextAttributes = _uiConfig[@"navigationTitleTextAttributes"]; From cefe484912735080ae068098ce14a6c3911aa22b Mon Sep 17 00:00:00 2001 From: yangbinqiao Date: Thu, 9 Mar 2023 18:55:02 +0800 Subject: [PATCH 08/13] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=9B=B4=E5=A4=9A=E8=8F=9C=E5=8D=95=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=8C=89=E9=92=AE=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mop.dart | 4 ++++ pubspec.lock | 49 +++++++++++++++++++++---------------------------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/lib/mop.dart b/lib/mop.dart index 2f18283..49c7904 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -69,6 +69,9 @@ class UIConfig { ///是否隐藏"更多"菜单中的"转发"按钮 bool isHideForwardMenu = false; + ///是否隐藏"更多"菜单中的"分享"按钮 + bool isHideShareAppletMenu = true; + /// 加载小程序过程中（小程序Service层还未加载成功，基础库还没有向SDK传递小程序配置信息），是否隐藏导航栏的关闭按钮 bool hideTransitionCloseButton = false; @@ -100,6 +103,7 @@ class UIConfig { "isHideFeedbackAndComplaints": isHideFeedbackAndComplaints, "isHideBackHome": isHideBackHome, "isHideForwardMenu": isHideForwardMenu, + "isHideShareAppletMenu": isHideShareAppletMenu, "hideTransitionCloseButton": hideTransitionCloseButton, "disableSlideCloseAppletGesture": disableSlideCloseAppletGesture, "capsuleConfig": capsuleConfig?.toMap(), diff --git a/pubspec.lock b/pubspec.lock index f39f99b..e3f3961 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -7,7 +7,7 @@ packages: name: async url: "https://pub.flutter-io.cn" source: hosted - version: "2.8.2" + version: "2.9.0" boolean_selector: dependency: transitive description: @@ -21,35 +21,28 @@ packages: name: characters url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.1" + version: "1.2.1" clock: dependency: transitive description: name: clock url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.flutter-io.cn" source: hosted - version: "1.15.0" + version: "1.16.0" fake_async: dependency: transitive description: name: fake_async url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -87,21 +80,28 @@ packages: name: matcher url: "https://pub.flutter-io.cn" source: hosted - version: "0.12.11" + version: "0.12.12" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.flutter-io.cn" + source: hosted + version: "0.1.5" meta: dependency: transitive description: name: meta url: "https://pub.flutter-io.cn" source: hosted - version: "1.7.0" + version: "1.8.0" path: dependency: transitive description: name: path url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.0" + version: "1.8.2" sky_engine: dependency: transitive description: flutter @@ -113,7 +113,7 @@ packages: name: source_span url: "https://pub.flutter-io.cn" source: hosted - version: "1.8.1" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -134,35 +134,28 @@ packages: name: string_scanner url: "https://pub.flutter-io.cn" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.flutter-io.cn" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.flutter-io.cn" source: hosted - version: "0.4.3" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.flutter-io.cn" - source: hosted - version: "1.3.0" + version: "0.4.12" vector_math: dependency: transitive description: name: vector_math url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.1" + version: "2.1.2" sdks: - dart: ">=2.14.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0" flutter: ">=2.2.3" From f6722df53a5cb09a90d16828d87441e2bb35eb0f Mon Sep 17 00:00:00 2001 From: wangzhaoyao Date: Thu, 9 Mar 2023 20:46:11 +0800 Subject: [PATCH 09/13] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0hideShareAppletMenu?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Classes/Api/MOP_initialize.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ios/Classes/Api/MOP_initialize.m b/ios/Classes/Api/MOP_initialize.m index 18732cd..d4b3ab3 100644 --- a/ios/Classes/Api/MOP_initialize.m +++ b/ios/Classes/Api/MOP_initialize.m @@ -78,7 +78,6 @@ NSError* error = nil; FATUIConfig *uiconfig = [[FATUIConfig alloc]init]; uiconfig.autoAdaptDarkMode = YES; - uiconfig.hideShareAppletMenu = NO; if (_uiConfig) { if (_uiConfig[@"navigationTitleTextAttributes"]) { uiconfig.navigationTitleTextAttributes = _uiConfig[@"navigationTitleTextAttributes"]; @@ -89,7 +88,7 @@ uiconfig.hideFeedbackMenu = [_uiConfig[@"isHideFeedbackAndComplaints"] boolValue]; uiconfig.hideForwardMenu = [_uiConfig[@"isHideForwardMenu"] boolValue]; uiconfig.autoAdaptDarkMode = [_uiConfig[@"autoAdaptDarkMode"] boolValue]; - + uiconfig.hideShareAppletMenu = [_uiConfig[@"isHideShareAppletMenu"] boolValue]; uiconfig.appletText = _uiConfig[@"appletText"]; uiconfig.hideTransitionCloseButton = [_uiConfig[@"hideTransitionCloseButton"] boolValue]; uiconfig.disableSlideCloseAppletGesture = [_uiConfig[@"disableSlideCloseAppletGesture"] boolValue]; From 07502871febff32b49dfacc2b22c88fa3b79e662 Mon Sep 17 00:00:00 2001 From: jenkins Date: Fri, 10 Mar 2023 20:44:29 +0800 Subject: [PATCH 10/13] 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 fe70af9..bf08398 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.39.9' - implementation 'com.finogeeks.mop:plugins:2.39.9' + implementation 'com.finogeeks.lib:finapplet:2.39.11' + implementation 'com.finogeeks.mop:plugins:2.39.11' } \ No newline at end of file diff --git a/pubspec.yaml b/pubspec.yaml index 595fcbc..924740f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: mop description: A Finogeeks MiniProgram Flutter SDK. -version: '2.39.9' +version: '2.39.11' homepage: https://github.com/finogeeks/mop-flutter-sdk environment: From 71f44503e4ba389d5892ca5c07f3ffe02ec5a1c9 Mon Sep 17 00:00:00 2001 From: zhongweiguang Date: Mon, 20 Mar 2023 17:47:20 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCapsuleConfig=20color?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=A2=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/mop.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/mop.dart b/lib/mop.dart index 49c7904..8baf561 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -184,12 +184,12 @@ class CapsuleConfig { "capsuleRightMargin": capsuleRightMargin, "capsuleCornerRadius": capsuleCornerRadius, "capsuleBorderWidth": capsuleBorderWidth, - "capsuleBgLightColor": capsuleBgLightColor, - "capsuleBgDarkColor": capsuleBgDarkColor, - "capsuleBorderLightColor": capsuleBorderLightColor, - "capsuleBorderDarkColor": capsuleBorderDarkColor, - "capsuleDividerLightColor": capsuleDividerLightColor, - "capsuleDividerDarkColor": capsuleDividerDarkColor, + "capsuleBgLightColor": capsuleBgLightColor.toSigned(32), + "capsuleBgDarkColor": capsuleBgDarkColor.toSigned(32), + "capsuleBorderLightColor": capsuleBorderLightColor.toSigned(32), + "capsuleBorderDarkColor": capsuleBorderDarkColor.toSigned(32), + "capsuleDividerLightColor": capsuleDividerLightColor.toSigned(32), + "capsuleDividerDarkColor": capsuleDividerDarkColor.toSigned(32), "moreLightImage": moreLightImage, "moreDarkImage": moreDarkImage, "moreBtnWidth": moreBtnWidth, From 08f1327bb7e058aa3d94db78767bdc8a09076100 Mon Sep 17 00:00:00 2001 From: jizelin Date: Wed, 22 Mar 2023 11:36:40 +0800 Subject: [PATCH 12/13] =?UTF-8?q?feat=EF=BC=9Aversion=20change?= 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 e24a1c1..c0169b5 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.9' - s.dependency 'FinAppletExt' , '2.39.9' + s.dependency 'FinApplet' , '2.40.0-dev20230322v02' + s.dependency 'FinAppletExt' , '2.40.0-dev20230322v02' end From 6f2147a98812d97276b00e3c0e4c4a282d45419b Mon Sep 17 00:00:00 2001 From: yangbinqiao Date: Thu, 23 Mar 2023 18:35:27 +0800 Subject: [PATCH 13/13] =?UTF-8?q?feat=EF=BC=9A=E6=96=B0=E5=A2=9E=E2=80=9C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=B0=E6=A1=8C=E9=9D=A2=E2=80=9D=E3=80=81?= =?UTF-8?q?=E2=80=9C=E6=94=B6=E8=97=8F=E2=80=9D=E7=9A=84=E6=98=BE=E9=9A=90?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/build.gradle | 4 ++-- lib/mop.dart | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index bf08398..ed9f964 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.39.11' - implementation 'com.finogeeks.mop:plugins:2.39.11' + implementation 'com.finogeeks.lib:finapplet:2.40.0-dev20230323v02' + implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230323v02' } \ No newline at end of file diff --git a/lib/mop.dart b/lib/mop.dart index 49c7904..e657560 100644 --- a/lib/mop.dart +++ b/lib/mop.dart @@ -72,6 +72,12 @@ class UIConfig { ///是否隐藏"更多"菜单中的"分享"按钮 bool isHideShareAppletMenu = true; + ///是否隐藏"更多"菜单中的"添加到桌面"按钮 + bool isHideAddToDesktopMenu = true; + + ///是否隐藏"更多"菜单中的"收藏"按钮 + bool isHideFavoriteMenu = true; + /// 加载小程序过程中（小程序Service层还未加载成功，基础库还没有向SDK传递小程序配置信息），是否隐藏导航栏的关闭按钮 bool hideTransitionCloseButton = false; @@ -104,6 +110,8 @@ class UIConfig { "isHideBackHome": isHideBackHome, "isHideForwardMenu": isHideForwardMenu, "isHideShareAppletMenu": isHideShareAppletMenu, + "isHideAddToDesktopMenu": isHideAddToDesktopMenu, + "isHideFavoriteMenu": isHideFavoriteMenu, "hideTransitionCloseButton": hideTransitionCloseButton, "disableSlideCloseAppletGesture": disableSlideCloseAppletGesture, "capsuleConfig": capsuleConfig?.toMap(),