From 8096da5f50abd4be69fa5637e9c2e8ea52e294fa Mon Sep 17 00:00:00 2001 From: jack <1484288157@qq.com> Date: Thu, 1 Jul 2021 15:47:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV5.0.0-?= =?UTF-8?q?=E6=96=B0=E7=A4=BE=E5=8C=BA=E5=B1=95=E7=A4=BA=E5=8A=9F=E8=83=BD?= =?UTF-8?q?(0701=20=E4=BA=A7=E5=93=81=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=981?= =?UTF-8?q?)=20https://git.ghzs.com/pm/halo-app-issues/-/issues/1253?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/forum/detail/ForumDetailFragment.kt | 6 ++++-- .../gamecenter/qa/video/detail/ForumVideoDetailFragment.kt | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt index cc70002617..7c34fbacc7 100644 --- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumDetailFragment.kt @@ -430,7 +430,8 @@ class ForumDetailFragment : BaseLazyTabFragment() { val container = layout.findViewById(R.id.container) for (text in contentList) { val item = inflater.inflate(R.layout.layout_popup_option_item, container, false) - if (mVideoFilter == text) { + if ((mBinding.filterContainer.visibility == View.VISIBLE && mFilter == text) || + (mBinding.videoFilterContainer.visibility == View.VISIBLE && mVideoFilter == text)) { (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.theme_font)) } else { (item as TextView).setTextColor(ContextCompat.getColor(requireContext(), R.color.text_999999)) @@ -532,7 +533,8 @@ class ForumDetailFragment : BaseLazyTabFragment() { } CommunityHomeFragment.VIDEO_REQUEST_CODE -> { - val forumVideoEntity = data?.getParcelableExtra(ForumVideoEntity::class.java.simpleName) ?: return + val forumVideoEntity = data?.getParcelableExtra(ForumVideoEntity::class.java.simpleName) + ?: return mViewModel?.getVideoDetail(forumVideoEntity.id) } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt index 6761cb4e15..0128ae5c4e 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/video/detail/ForumVideoDetailFragment.kt @@ -193,7 +193,6 @@ class ForumVideoDetailFragment : BaseFragment_TabLayout() { } updateToolbarParams(0) } else { - val statusBarHeight = DisplayUtils.getStatusBarHeight(requireContext().resources) updateToolbarParams(mVideoHeight / 2) } } else {