From bb4878eab48b84d24c330def50a32e89cdfe9ba3 Mon Sep 17 00:00:00 2001 From: lyr Date: Thu, 5 May 2022 10:11:37 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5?= =?UTF-8?q?.9.0=E3=80=91=E6=96=B0=E7=A4=BE=E5=8C=BA7=E6=9C=9F-=E8=AE=BA?= =?UTF-8?q?=E5=9D=9B=E4=B8=BB=E9=A1=B5=E4=BC=98=E5=8C=96=EF=BC=880427UI?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=20=E9=81=97=E7=95=99=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=89https://git.shanqu.cc/pm/halo-app-issues/-/issues/1792?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../forum/home/CommunityHomeFragment.kt | 61 +++++++++++-------- .../gh/gamecenter/forum/home/ForumFragment.kt | 4 +- 2 files changed, 37 insertions(+), 28 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt index 3bd9358c56..d09344fdfc 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/CommunityHomeFragment.kt @@ -95,7 +95,6 @@ class CommunityHomeFragment : LazyFragment() { it.width, DisplayUtils.getStatusBarHeight(resources) + 52f.dip2px() ) - changeNavigationBg() } } } @@ -132,15 +131,15 @@ class CommunityHomeFragment : LazyFragment() { mFragmentList.clear() val tag = "android:switcher:${viewPager.id}:" val forumArticleListFragment = childFragmentManager.findFragmentByTag("${tag}0") - ?: ForumArticleListFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "社区", EntranceUtils.KEY_PATH to "推荐")) + ?: ForumArticleListFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "社区", EntranceUtils.KEY_PATH to "推荐")) mFragmentList.add(forumArticleListFragment) val forumFragment = childFragmentManager.findFragmentByTag("${tag}1") - ?: ForumFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "社区")) + ?: ForumFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "社区")) mFragmentList.add(forumFragment) val activityFragment = childFragmentManager.findFragmentByTag("${tag}2") - ?: ForumActivityFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "活动")) + ?: ForumActivityFragment().with(bundleOf(EntranceUtils.KEY_ENTRANCE to "活动")) mFragmentList.add(activityFragment) viewPager.run { @@ -154,18 +153,27 @@ class CommunityHomeFragment : LazyFragment() { doOnScroll( onPageSelected = { position -> communityEditBtn.goneIf(position != 0) - changeNavigationBg() when (position) { TAB_RECOMMEND_INDEX -> { + root.setBackgroundColor(R.color.background.toColor()) topBg.translationY = 0F + changeNavigationBg() NewLogUtils.logCommunityHomeEvent("click_for_you_tab") } TAB_FORUM_INDEX -> { - topBg.translationY = -(mFragmentList[1] as ForumFragment).translationY.toFloat() + root.setBackgroundColor(R.color.white.toColor()) + (mFragmentList[1] as ForumFragment).translationY.run { + topBg.translationY = -this.toFloat() + changeNavigationBg(this) + } NewLogUtils.logCommunityHomeEvent("click_forum_tab") } TAB_ACTIVITY_INDEX -> { - topBg.translationY = -(mFragmentList[2] as ForumActivityFragment).translationY.toFloat() + root.setBackgroundColor(R.color.background.toColor()) + (mFragmentList[2] as ForumActivityFragment).translationY.run { + topBg.translationY = -this.toFloat() + changeNavigationBg(this) + } NewLogUtils.logCommunityHomeEvent("click_activity_tab") FloatingBackViewManager.disableBackView() FloatingBackViewManager.dismissBackView() @@ -318,14 +326,14 @@ class CommunityHomeFragment : LazyFragment() { val contentView = LayoutInflater.from(context).inflate(R.layout.community_edit_window, null) val params = ViewGroup.LayoutParams(resources.displayMetrics.widthPixels, ViewGroup.LayoutParams.WRAP_CONTENT) val dialog = TrackableDialog( - requireContext(), - R.style.DialogWindowTransparent, - "社区", - UserManager.getInstance().community.name, - null, - "发布-空白", - "发布-返回", - false) + requireContext(), + R.style.DialogWindowTransparent, + "社区", + UserManager.getInstance().community.name, + null, + "发布-空白", + "发布-返回", + false) val window = dialog.window window?.setGravity(Gravity.BOTTOM) window?.setWindowAnimations(R.style.community_publication_animation) @@ -363,12 +371,12 @@ class CommunityHomeFragment : LazyFragment() { MtaHelper.onEvent("论坛首页", "发布", "发视频") NewLogUtils.logPublishVideoEnter("推荐信息流", "", "") startActivityForResult( - VideoPublishActivity.getIntent( - context = requireContext(), - type = "", - entrance = mEntrance, - path = "论坛首页"), - VIDEO_REQUEST_CODE) + VideoPublishActivity.getIntent( + context = requireContext(), + type = "", + entrance = mEntrance, + path = "论坛首页"), + VIDEO_REQUEST_CODE) dialog.dismiss() } } @@ -397,7 +405,7 @@ class CommunityHomeFragment : LazyFragment() { VIDEO_REQUEST_CODE -> { val forumVideoEntity = data?.getParcelableExtra(ForumVideoEntity::class.java.simpleName) - ?: return + ?: return mViewModel?.getVideoDetail(forumVideoEntity.id) } } @@ -461,14 +469,15 @@ class CommunityHomeFragment : LazyFragment() { } fun translateTopBg(y: Int) { - mBinding?.topBg?.run { - translationY = -y.toFloat() + mBinding?.run { + topBg.translationY = -y.toFloat() + changeNavigationBg(y) } } - private fun changeNavigationBg() { + private fun changeNavigationBg(y: Int = 0) { mBinding?.run { - if (viewPager.currentItem != TAB_RECOMMEND_INDEX) { + if (viewPager.currentItem != TAB_RECOMMEND_INDEX && y != 0) { if (navigationBg.drawable == null) { navigationBg.setBackgroundColor(R.color.white.toColor()) navigationBg.setImageBitmap(mNavigationBitmap) diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt index 55f16995b1..0895556ef4 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumFragment.kt @@ -348,8 +348,8 @@ class ForumFragment: LazyFragment(), SwipeRefreshLayout.OnRefreshListener { welfareLists.run { add(Triple(R.drawable.ic_forum_tool_box, "游戏工具箱", "TOOLS BOX")) add(Triple(R.drawable.ic_forum_libao_center, "礼包中心", "GIFT CENTER")) - add(Triple(R.drawable.ic_forum_game_moment, "游戏动态", "DYNAMIC")) - add(Triple(R.drawable.ic_forum_news, "资讯中心", "INFORMATION")) + add(Triple(R.drawable.ic_forum_game_moment, "游戏动态", "INFORMATION")) + add(Triple(R.drawable.ic_forum_news, "资讯中心", "GAME NEWS")) } mBinding?.run {