From 2aaf6d8a9c043818b09d3282f4d2a292d71b005c Mon Sep 17 00:00:00 2001
From: juntao <chenjuntao@ghzhushou.com>
Date: Wed, 24 Mar 2021 15:26:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=80=E6=B5=8B=E8=A1=A8?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98(0324=E6=B5=8B=E8=AF=95=203?=
 =?UTF-8?q?,4,5)=20https://git.ghzs.com/pm/halo-app-issues/-/issues/1134?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/viewholder/GameHeadViewHolder.kt          |  4 ++--
 .../java/com/gh/gamecenter/entity/SubjectEntity.kt    |  2 +-
 .../home/LegacyHomeFragmentAdapterAssistant.kt        |  1 +
 .../com/gh/gamecenter/subject/SubjectListViewModel.kt |  3 ++-
 .../gh/gamecenter/subject/rows/SubjectRowsFragment.kt | 11 +++++++++++
 5 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt
index 91ad518400..e62017d51b 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/GameHeadViewHolder.kt
@@ -27,10 +27,10 @@ class GameHeadViewHolder(var binding: GameHeadItemBinding) : BaseRecyclerViewHol
         val text = if ("change" == subject.home) "换一批" else "全部 >"
         binding.headMore.text = text
 
-        if (subject.indexRightTop != "none") {
+        if (subject.indexRightTop != null && subject.indexRightTop != "none") {
             binding.headMore.visibility = View.VISIBLE
             if (subject.indexRightTop == "all") {
-                binding.headMore.text = "全部"
+                binding.headMore.text = "全部 >"
             } else {
                 binding.headMore.text = "更多"
             }
diff --git a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt
index e9d9d2ea7d..df24665362 100644
--- a/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt
+++ b/app/src/main/java/com/gh/gamecenter/entity/SubjectEntity.kt
@@ -37,7 +37,7 @@ data class SubjectEntity(@SerializedName("_id")
                          var briefStyle: String = "", // 简介样式，大小+简介（size&brief）、评分+简介（star&brief）、评分（star）
 
                          @SerializedName("index_right_top")
-                         var indexRightTop: String = "",
+                         var indexRightTop: String? = null,
                          @SerializedName("index_right_top_link")
                          var indexRightTopLink: LinkEntity? = null,
                          var remark: String? = null // 开测表备注
diff --git a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt
index edd12790d2..b12a1dcbee 100644
--- a/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt
+++ b/app/src/main/java/com/gh/gamecenter/home/LegacyHomeFragmentAdapterAssistant.kt
@@ -415,6 +415,7 @@ class LegacyHomeFragmentAdapterAssistant(private var mContext: Context,
             val linkEntity = LinkEntity()
             linkEntity.link = link
             linkEntity.type = entity.type
+            linkEntity.text = entity.text
             setPageSwitchData()
             DirectUtils.directToLinkPage(mContext, linkEntity, "(游戏-专题:$name-大图)", "首页游戏")
         }
diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt
index 5766969baf..c44a85af08 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt
+++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectListViewModel.kt
@@ -31,7 +31,8 @@ class SubjectListViewModel(application: Application,
         return RetrofitManager.getInstance(getApplication()).sensitiveApi.getColumn(
                 subjectData.subjectId,
                 subjectData.sort,
-                subjectData.filter, page)
+                if (subjectData.filter.isEmpty()) "type:全部" else subjectData.filter,
+                page)
     }
 
     override fun mergeResultLiveData() {
diff --git a/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt b/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt
index 611077b672..ddc84bd757 100644
--- a/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt
+++ b/app/src/main/java/com/gh/gamecenter/subject/rows/SubjectRowsFragment.kt
@@ -203,6 +203,17 @@ class SubjectRowsFragment : BaseFragment<Any>() {
 
         }
 
+        if ((minSizeValue == "-1" || minSizeValue == null)
+                && (maxSizeValue == "-1" || maxSizeValue == null)) {
+            // 显示头图（后台需要 `type:全部` 作为显示头图的依据）
+            val filterAll = UrlFilterUtils.getFilterQuery("type", "全部")
+            filters = if (filters.isNotEmpty()) {
+                "$filters,$filterAll"
+            } else {
+                filterAll
+            }
+        }
+
         mSubjectData.filter = filters
         mListFragment.selectedLabelList = findAllSelectedLabel(mLabelsContainer)
         mListFragment.refreshPage(mSubjectData.filter, mSubjectData.sort, mSelectedFilterSize)