From a2ed406ffd9ff70bfdb1e549075e017970ee68ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= <yeziwei@ghzhushou.com>
Date: Tue, 20 Feb 2024 16:26:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=9Atab=E5=AF=BC=E8=88=AA=E9=A1=B5-?=
 =?UTF-8?q?0220=E6=B5=8B=E8=AF=95-=E5=AE=A2=E6=88=B7=E7=AB=AF=20https://ji?=
 =?UTF-8?q?ra.shanqu.cc/browse/GHZS-4783?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/SearchToolbarTabWrapperFragment.kt    |  5 ++---
 .../gamecenter/wrapper/ToolbarWrapperFragment.kt  |  1 +
 .../fragment_search_toolbar_tab_wrapper.xml       |  3 +--
 .../gh/gamecenter/common/view/AvatarBorderView.kt | 15 +++++++++------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt
index 77cbde07b8..31b50bfdc9 100644
--- a/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt
@@ -706,6 +706,7 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISmartRefresh,
                         mShowTwoLevel = false
 
                         if (mIsDragging) {
+                            mAutoFinishTwoLevelHandler?.removeMessages(KEY_AUTO_FINISH_TWO_LEVEL)
                             mElapsedHelper.pauseCounting()
                             mPullDownPush?.run {
                                 SensorsBridge.trackEvent(
@@ -1381,7 +1382,7 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISmartRefresh,
         val currentTabStyle = getCurrentTabStyle()
         currentTabStyle?.offsetRatio = offset / totalHeight.toFloat()
         if (((currentTabStyle?.isSlideBackgroundColorShow == true || (currentTabStyle != null && isDarkModeChanged)) && offset >= totalHeight)
-            || currentTabStyle?.isSlideBackgroundColorEnable == false
+            || (currentTabStyle?.isSlideBackgroundColorEnable == false && mViewModel.isTabCustomPage(mLastSelectedPosition))
         ) {
             currentTabStyle.isSlideBackgroundColorShow = false
             currentTabStyle.primaryColor = mBackgroundWhiteColor
@@ -1408,8 +1409,6 @@ class SearchToolbarTabWrapperFragment : BaseTabWrapperFragment(), ISmartRefresh,
             updateAppBarColorWhenScrollChanged(colorInBetween)
             currentTabStyle?.primaryColor = colorInBetween
             currentTabStyle?.useLightStyle = offsetMeetsCriticalPoint
-            currentTabStyle?.primaryColor = colorInBetween
-            currentTabStyle?.useLightStyle = offsetMeetsCriticalPoint
             if (mIsDisplayingLightContent != currentTabStyle?.useLightStyle) {
                 mIsDisplayingLightContent = offsetMeetsCriticalPoint
             }
diff --git a/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt b/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt
index a3bbaa2128..afa52bdd6e 100644
--- a/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt
@@ -482,6 +482,7 @@ class ToolbarWrapperFragment : LazyFragment(), ToolbarController, ISmartRefresh,
                         mShowTwoLevel = false
 
                         if (mIsDragging) {
+                            mAutoFinishTwoLevelHandler?.removeMessages(KEY_AUTO_FINISH_TWO_LEVEL)
                             mElapsedHelper.pauseCounting()
                             mPullDownPush?.run {
                                 SensorsBridge.trackEvent(
diff --git a/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml b/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml
index 6bc33453d6..dcf609abbc 100644
--- a/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml
+++ b/app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml
@@ -338,8 +338,7 @@
         <com.gh.gamecenter.common.view.StatusBarView
             android:id="@+id/statusBar"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:background="@color/transparent" />
+            android:layout_height="0dp" />
     </FrameLayout>
 
     <include
diff --git a/module_common/src/main/java/com/gh/gamecenter/common/view/AvatarBorderView.kt b/module_common/src/main/java/com/gh/gamecenter/common/view/AvatarBorderView.kt
index 526b7431d9..d196008b95 100644
--- a/module_common/src/main/java/com/gh/gamecenter/common/view/AvatarBorderView.kt
+++ b/module_common/src/main/java/com/gh/gamecenter/common/view/AvatarBorderView.kt
@@ -62,8 +62,7 @@ class AvatarBorderView : ConstraintLayout {
         avatarContainer = findViewById(R.id.avatarContainer)
         avatarBorderView = findViewById(R.id.avatarBorderView)
 
-        // 避免我的光环头像在首页底部Tab变更时没有正确修改LayoutParams
-        post { changeLayoutParams() }
+        changeLayoutParams()
     }
 
     private fun changeLayoutParams() {
@@ -75,7 +74,8 @@ class AvatarBorderView : ConstraintLayout {
             val params = layoutParams
             params.width = mAvatarWidth.toInt()
             params.height = mAvatarWidth.toInt()
-            layoutParams = params
+            // 避免我的光环头像在首页底部Tab变更时没有正确修改LayoutParams
+            post { layoutParams = params }
             val roundingParams = RoundingParams.fromCornersRadius(mAvatarWidth)
             roundingParams.borderColor = mAvatarBorderColor
             roundingParams.borderWidth = mAvatarBorderWidth
@@ -85,7 +85,8 @@ class AvatarBorderView : ConstraintLayout {
             val params = layoutParams
             params.width = mAvatarWidth.toInt()
             params.height = mAvatarWidth.toInt()
-            layoutParams = params
+            // 避免我的光环头像在首页底部Tab变更时没有正确修改LayoutParams
+            post { layoutParams = params }
             val drawable = GradientDrawable().apply {
                 setColor(R.color.transparent.toColor())
                 shape = GradientDrawable.OVAL
@@ -102,13 +103,15 @@ class AvatarBorderView : ConstraintLayout {
                 params.width = (mAvatarWidth * 3 / 2).toInt()
                 params.height = (mAvatarWidth * 3 / 2).toInt()
             }
-            layoutParams = params
+            // 避免我的光环头像在首页底部Tab变更时没有正确修改LayoutParams
+            post { layoutParams = params }
         }
         badgeView?.apply {
             val params = layoutParams
             params.width = mBadgeWidth.toInt()
             params.height = mBadgeWidth.toInt()
-            layoutParams = params
+            // 避免我的光环头像在首页底部Tab变更时没有正确修改LayoutParams
+            post { layoutParams = params }
         }
     }