修复开测表测试问题(0324测试 3,4,5) https://git.ghzs.com/pm/halo-app-issues/-/issues/1134

This commit is contained in:
juntao
2021-03-24 15:26:20 +08:00
parent f119f6751a
commit 2aaf6d8a9c
5 changed files with 17 additions and 4 deletions

View File

@ -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 = "更多"
}

View File

@ -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 // 开测表备注

View File

@ -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-大图)", "首页游戏")
}

View File

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

View File

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