Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 多tab导航页-0220测试-客户端 https://jira.shanqu.cc/browse/GHZS-4783

Browse Source
This commit is contained in:
叶子维
2024-02-20 16:26:53 +08:00
committed by chenjuntao
parent ca7b966eed
commit a2ed406ffd
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/gamecenter/wrapper/SearchToolbarTabWrapperFragment.kt
View File

@ -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
}

1
app/src/main/java/com/gh/gamecenter/wrapper/ToolbarWrapperFragment.kt
View File

@ -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(

3
app/src/main/res/layout/fragment_search_toolbar_tab_wrapper.xml
View File

@ -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

15
module_common/src/main/java/com/gh/gamecenter/common/view/AvatarBorderView.kt
View File

@ -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 }
}
}