Merge branch 'master' into X5

# Conflicts:
#	android/build.gradle
master
yangbinqiao 2023-03-23 19:47:17 +08:00
commit 93fd37f934
2 changed files with 10 additions and 2 deletions

View File

@ -91,6 +91,6 @@ kapt {
} }
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.finogeeks.lib:finapplet:2.40.0-dev20230315v02' implementation 'com.finogeeks.lib:finapplet:2.40.0-dev20230323v02'
implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230315v02' implementation 'com.finogeeks.mop:plugins:2.40.0-dev20230323v02'
} }

View File

@ -72,6 +72,12 @@ class UIConfig {
///"更多""分享" ///"更多""分享"
bool isHideShareAppletMenu = true; bool isHideShareAppletMenu = true;
///"更多""添加到桌面"
bool isHideAddToDesktopMenu = true;
///"更多""收藏"
bool isHideFavoriteMenu = true;
/// ServiceSDK /// ServiceSDK
bool hideTransitionCloseButton = false; bool hideTransitionCloseButton = false;
@ -107,6 +113,8 @@ class UIConfig {
"isHideBackHome": isHideBackHome, "isHideBackHome": isHideBackHome,
"isHideForwardMenu": isHideForwardMenu, "isHideForwardMenu": isHideForwardMenu,
"isHideShareAppletMenu": isHideShareAppletMenu, "isHideShareAppletMenu": isHideShareAppletMenu,
"isHideAddToDesktopMenu": isHideAddToDesktopMenu,
"isHideFavoriteMenu": isHideFavoriteMenu,
"hideTransitionCloseButton": hideTransitionCloseButton, "hideTransitionCloseButton": hideTransitionCloseButton,
"disableSlideCloseAppletGesture": disableSlideCloseAppletGesture, "disableSlideCloseAppletGesture": disableSlideCloseAppletGesture,
"capsuleConfig": capsuleConfig?.toMap(), "capsuleConfig": capsuleConfig?.toMap(),