fix: 【光环助手】排行榜详情页没有显示角标 https://jira.shanqu.cc/browse/GHZSCY-6680

.gitlab-ci.yml

@@ -72,6 +72,7 @@ android_build:
   only:
     - dev
     - release
+    - feat/GHZSCY-6705
 
 # 代码检查
 sonarqube_analysis:
@@ -156,4 +157,5 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - release
+        - release
+        - feat/GHZSCY-6705

app/src/main/java/com/gh/common/util/ViewPagerFragmentHelper.kt

@@ -174,6 +174,7 @@ object ViewPagerFragmentHelper {
                     EntranceConsts.KEY_SUBJECT_DATA,
                     SubjectData(entity.link, entity.text, false, subjectType = subjectType)
                 )
+                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "detail")
                 bundle.putBoolean(EntranceConsts.KEY_SHOW_DOWNLOAD_MENU, !isTabWrapper)
             }
             // 专题合集详情页
@@ -183,6 +184,7 @@ object ViewPagerFragmentHelper {
                 bundle.putInt(EntranceConsts.KEY_POSITION, 0)
                 bundle.putString(EntranceConsts.KEY_COLUMNNAME, entity.text)
                 bundle.putBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION, true)
+                bundle.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
             }
             // 开服表
             TYPE_SERVER -> {

app/src/main/java/com/gh/gamecenter/subject/SubjectFragment.kt

@@ -4,10 +4,10 @@ import android.view.View
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
+import com.gh.gamecenter.R
 import com.gh.gamecenter.common.base.fragment.LazyFragment
 import com.gh.gamecenter.common.constant.EntranceConsts
 import com.gh.gamecenter.core.utils.PageSwitchDataHelper
-import com.gh.gamecenter.R
 import com.gh.gamecenter.databinding.FragmentSubjectBinding
 import com.gh.gamecenter.entity.SubjectSettingEntity
 import com.gh.gamecenter.subject.rows.SubjectRowsFragment
@@ -28,7 +28,10 @@ open class SubjectFragment : LazyFragment() {
     }
 
     override fun onFragmentFirstVisible() {
-        initMenu(R.menu.menu_download)
+        // 是否为专题合集详情子页面
+        val isColumnCollection = arguments?.getBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION) ?: false
+        // 专题合集详情子页面不需要显示菜单
+        if (!isColumnCollection) initMenu(R.menu.menu_download)
 
         mViewModel = provideViewModel()
 
@@ -49,10 +52,12 @@ open class SubjectFragment : LazyFragment() {
             }
         })
 
-        // 获取专题名称
+        if (!isColumnCollection) {// 专题合集详情子页面不需要显示专题名称
-        mViewModel?.subjectNameLD?.observe(this, Observer {
+            // 获取专题名称
-            setNavigationTitle(it)
+            mViewModel?.subjectNameLD?.observe(this, Observer {
-        })
+                setNavigationTitle(it)
+            })
+        }
     }
 
     override fun initRealView() {
@@ -75,11 +80,13 @@ open class SubjectFragment : LazyFragment() {
                 childFragmentManager.findFragmentByTag(tag)
                     ?: SubjectTileFragment()
             }
+
             "rows" == entity.typeEntity.layout -> {
                 tag = SubjectRowsFragment::class.java.name
                 childFragmentManager.findFragmentByTag(tag)
                     ?: SubjectRowsFragment()
             }
+
             else -> {
                 tag = SubjectTabFragment::class.java.name
                 childFragmentManager.findFragmentByTag(tag)

app/src/main/java/com/gh/gamecenter/subject/tab/SubjectTabFragment.kt

@@ -22,6 +22,7 @@ import com.gh.gamecenter.core.utils.UrlFilterUtils
 import com.gh.gamecenter.databinding.FragmentSubjectTabBinding
 import com.gh.gamecenter.entity.SubjectData
 import com.gh.gamecenter.entity.SubjectSettingEntity
+import com.gh.gamecenter.subject.SubjectFragment
 import com.gh.gamecenter.subject.SubjectListFragment
 import com.google.android.material.tabs.TabLayout
 import org.json.JSONException
@@ -62,7 +63,6 @@ class SubjectTabFragment : BaseFragment<Any>() {
                     UrlFilterUtils.getFilterQuery("tags", tag)
                 }
                 bundle?.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, copyData)
-                bundle?.putString(EntranceConsts.KEY_SUBJECT_TYPE, "detail")
                 element.arguments = bundle
                 fragments.add(element)
             }
@@ -72,10 +72,10 @@ class SubjectTabFragment : BaseFragment<Any>() {
 
             subjectList.filterIndexed { index, subject ->
                 val element = childFragmentManager.findFragmentByTag("${fragmentTag}$index")
-                    ?: SubjectListFragment()
+                    ?: SubjectFragment()
                 val bundle = arguments?.clone() as Bundle?
                 bundle?.putParcelable(EntranceConsts.KEY_SUBJECT_DATA, subject)
-                bundle?.putString(EntranceConsts.KEY_SUBJECT_TYPE, "tab")
+                bundle?.putParcelableArrayList(EntranceConsts.KEY_DATA, null)
                 element.arguments = bundle
                 fragments.add(element)
 

app/src/main/java/com/gh/gamecenter/subject/tile/SubjectTileFragment.kt

@@ -74,24 +74,28 @@ class SubjectTileFragment : BaseFragment<Any>() {
             mBinding.subjectTypeList.adapter = adapter
         }
 
-        // Appbar 交互
+        // 是否为专题合集详情子页面
-        mBinding.subjectAppbar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
+        val isColumnCollection = arguments?.getBoolean(EntranceConsts.KEY_IS_COLUMN_COLLECTION) ?: false
-            if (!TextUtils.isEmpty(mSubjectData.subjectName) && activity is ToolbarController) {
+        if (!isColumnCollection) {
-                val totalScrollRange = appBarLayout.totalScrollRange
+            // Appbar 交互
-                if (abs(verticalOffset) < totalScrollRange / 2) {
+            mBinding.subjectAppbar.addOnOffsetChangedListener(AppBarLayout.OnOffsetChangedListener { appBarLayout, verticalOffset ->
-                    (activity as ToolbarController).setNavigationTitle(mSubjectData.subjectName)
+                if (!TextUtils.isEmpty(mSubjectData.subjectName) && activity is ToolbarController) {
-                } else if (abs(verticalOffset) == totalScrollRange && totalScrollRange != 0) {
+                    val totalScrollRange = appBarLayout.totalScrollRange
-                    (activity as ToolbarController).setNavigationTitle(
+                    if (abs(verticalOffset) < totalScrollRange / 2) {
-                        StringUtils.buildString(
+                        (activity as ToolbarController).setNavigationTitle(mSubjectData.subjectName)
-                            mSubjectData.subjectName,
+                    } else if (abs(verticalOffset) == totalScrollRange && totalScrollRange != 0) {
-                            "-",
+                        (activity as ToolbarController).setNavigationTitle(
-                            mSelectedTypeName,
+                            StringUtils.buildString(
-                            "↑"
+                                mSubjectData.subjectName,
+                                "-",
+                                mSelectedTypeName,
+                                "↑"
+                            )
                         )
-                    )
+                    }
                 }
-            }
+            })
-        })
+        }
 
         loadData()
     }