From 93369f5676d4ad1a09dbbb9afde73eca9bd0aabd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Thu, 13 Mar 2025 16:36:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9?= =?UTF-8?q?=E6=89=8B=E3=80=91=E6=B8=B8=E6=88=8F=E8=AF=A6=E6=83=85=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89tab=E5=85=B3=E8=81=94=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=A7=86=E9=A2=91=E6=92=AD?= =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?SCY-7661?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt | 1 + .../com/gh/gamecenter/home/custom/CustomPageFragment.kt | 6 +++++- .../com/gh/gamecenter/common/constant/EntranceConsts.java | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt index cf45dd13b6..919f237aee 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailWrapperFragment.kt @@ -757,6 +757,7 @@ class GameDetailWrapperFragment : BaseLazyFragment(), IScrollable { bundle.putString(EntranceConsts.KEY_CUSTOM_PAGE_ID, tabEntity.link?.link) bundle.putString(EntranceConsts.KEY_CUSTOM_PAGE_NAME, tabEntity.link?.text) bundle.putBoolean(EntranceConsts.KEY_SHOW_FLOATING_WINDOW, false) + bundle.putBoolean(EntranceConsts.KEY_SHOW_PULL_DOWN_PUSH, false) } } fragment?.let { diff --git a/app/src/main/java/com/gh/gamecenter/home/custom/CustomPageFragment.kt b/app/src/main/java/com/gh/gamecenter/home/custom/CustomPageFragment.kt index e0dda994ab..994992b1b4 100644 --- a/app/src/main/java/com/gh/gamecenter/home/custom/CustomPageFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/home/custom/CustomPageFragment.kt @@ -112,6 +112,7 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB private var bottomTabName = "" private var tabIndex = -1 private var showFloatingWindow = true + private var showPullDownPush = true private lateinit var pageLocation: PageLocation @@ -143,6 +144,7 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB bottomTabName = arguments?.getString(EntranceConsts.KEY_BOTTOM_TAB_NAME, "") ?: "" tabIndex = arguments?.getInt(EntranceConsts.KEY_TAB_INDEX, -1) ?: -1 showFloatingWindow = arguments?.getBoolean(EntranceConsts.KEY_SHOW_FLOATING_WINDOW, true) ?: true + showPullDownPush = arguments?.getBoolean(EntranceConsts.KEY_SHOW_PULL_DOWN_PUSH, true) ?: true val tabName = arguments?.getString(EntranceConsts.KEY_TAB_NAME, "") ?: "" val multiTabNavId = arguments?.getString(EntranceConsts.KEY_MULTI_TAB_NAV_ID, "") ?: "" val multiTabNavName = arguments?.getString(EntranceConsts.KEY_MULTI_TAB_NAV_NAME, "") ?: "" @@ -587,7 +589,9 @@ class CustomPageFragment : LazyFragment(), ISmartRefreshContent, IScrollable, IB private fun buildPriorityChain() { val videoHandler = VideoHandler(24, scrollCalculatorHelper) - priorityChain.addHandler(pullDownPushHandler) + if (showPullDownPush) { + priorityChain.addHandler(pullDownPushHandler) + } if (showFloatingWindow) { val floatingWindowHandler = CustomFloatingWindowHandler(23) diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java index e2e0d05004..520a0a335a 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/EntranceConsts.java @@ -364,6 +364,7 @@ public class EntranceConsts { public static final String KEY_DISPLAY_TYPE = "display_type"; public static final String KEY_SHOW_FLOATING_WINDOW = "key_show_floating_window"; + public static final String KEY_SHOW_PULL_DOWN_PUSH = "key_show_pull_down_push"; public static final String KEY_HIDE_TOOLBAR = "hide_toolbar"; public static final String KEY_ACCT_ZONE_INFO = "acct_zone_info";