Merge branch 'master' into feat/add_config

# Conflicts: # android/build.gradle # lib/mop.dart
2023-03-24 10:39:29 +08:00 · 2023-03-24 10:39:29 +08:00 · 864d79e79a
parent d63b37f4e9 76c6011d45
commit 864d79e79a
5 changed files with 53 additions and 53 deletions
--- 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.12-alpha20230322v02'
-    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'
 }
--- a/ios/Classes/Api/MOP_initialize.m
+++ b/ios/Classes/Api/MOP_initialize.m
@ -87,7 +87,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];
--- a/lib/mop.dart
+++ b/lib/mop.dart
@ -279,22 +279,28 @@ class UIConfig {
  /// 是否清除导航栏导航按钮的背景 ios未发现该属性
  bool isClearNavigationBarNavButtonBackground = false;

-  /// 是否隐藏"更多"菜单中的"反馈与投诉"菜单入口
+  /// 隐藏...弹出菜单中的 【反馈与投诉】 菜单
  bool isHideFeedbackAndComplaints = false;

-  /// 是否隐藏"更多"菜单中的"返回首页"菜单入口
+  /// 隐藏...弹出菜单中的 【返回首页】 菜单
  bool isHideBackHome = false;

-  // 隐藏...弹出菜单中的 【转发】 的菜单，默认为false
+  /// 隐藏...弹出菜单中的 【转发】 的菜单，默认为false
  bool isHideForwardMenu = false;

-  // 隐藏...弹出菜单中的 【分享】 的菜单，默认为true
+  /// 隐藏...弹出菜单中的 【分享】 的菜单，默认为true
  bool isHideShareAppletMenu = true;

-  // 隐藏...弹出菜单中的 【重新进入小程序】 的菜单，默认为false
+  /// 隐藏...弹出菜单中的 【添加到桌面】 菜单
+  bool isHideAddToDesktopMenu = true;
+
+  /// 隐藏...弹出菜单中的 【收藏】 菜单
+  bool isHideFavoriteMenu = true;
+
+  // 隐藏...弹出菜单中的 【重新进入小程序】 菜单，默认为false
  bool isHideRefreshMenu = false;

-  // 隐藏...弹出菜单中的 【设置】 的菜单，默认为false
+  // 隐藏...弹出菜单中的 【设置】 菜单，默认为false
  bool isHideSettingMenu = false;

  /// 胶囊按钮配置
@ -364,6 +370,8 @@ class UIConfig {
      "isHideRefreshMenu": isHideRefreshMenu,
      "isHideShareAppletMenu": isHideShareAppletMenu,
      "isHideSettingMenu": isHideSettingMenu,
+      "isHideAddToDesktopMenu": isHideAddToDesktopMenu,
+      "isHideFavoriteMenu": isHideFavoriteMenu,
      "hideTransitionCloseButton": hideTransitionCloseButton,
      "capsuleConfig": capsuleConfig?.toMap(),
      "navHomeConfig": navHomeConfig?.toMap(),
@ -932,7 +940,6 @@ class Mop {
  /// [userId] 用户id
  /// [finStoreConfigs] 多服务配置
  /// [uiConfig] UI配置
-  /// [config]   小程序相关配置
  /// [debug] 设置debug模式，影响调试和日志
  /// [customWebViewUserAgent] 设置自定义webview ua
  /// [appletIntervalUpdateLimit] 设置小程序批量更新周期
@ -1106,20 +1113,20 @@ class Mop {
    _appletHandlerApis["getUserInfo"] = (params) {
      return handler.getUserInfo();
    };
-    _appletHandlerApis["getCustomMenus"] = (params) async {
-      final res = await handler.getCustomMenus(params["appId"]);
-      List<Map<String, dynamic>> list = [];
-      res.forEach((element) {
-        Map<String, dynamic> 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<Map<String, dynamic>> list = [];
+    //   res.forEach((element) {
+    //     Map<String, dynamic> 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"],
--- 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"
--- 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.11'
 homepage: https://github.com/finogeeks/mop-flutter-sdk

 environment: