From 2e95a42f3c550e70cdfdf2ea6394d659bb91e910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=B6=E5=AD=90=E7=BB=B4?= Date: Mon, 4 Nov 2024 17:24:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B8=B8=E6=88=8F=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E9=A1=B5-=E5=8A=9F=E8=83=BD=E6=A0=87=E7=AD=BE-APP=E2=80=94?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=20https://jira.shanqu.cc/browse/GHZ?= =?UTF-8?q?SCY-6157?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/gamedetail/NewGameDetailFragment.kt | 4 +--- .../gh/gamecenter/gamedetail/dialog/GameFunctionAdapter.kt | 5 ++++- .../com/gh/gamecenter/gamedetail/entity/GameDetailData.kt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/NewGameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/NewGameDetailFragment.kt index 2a713923e3..4191e07d47 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/NewGameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/NewGameDetailFragment.kt @@ -516,9 +516,7 @@ class NewGameDetailFragment(private val downloadButton: DownloadButton) : LazyFr LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT ).apply { - if (index != showTags.size - 1) { - setMargins(8F.dip2px(), 0, 0, 0) - } + setMargins(8F.dip2px(), 0, 0, 0) } ) } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameFunctionAdapter.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameFunctionAdapter.kt index 6026b203e1..22477d23eb 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameFunctionAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/dialog/GameFunctionAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.gh.gamecenter.common.utils.ImageUtils import com.gh.gamecenter.common.utils.dip2px import com.gh.gamecenter.common.utils.toBinding +import com.gh.gamecenter.common.utils.toColor import com.gh.gamecenter.databinding.ItemGameDetailFunctionBinding import com.gh.gamecenter.gamedetail.entity.GameDetailInfoTag import com.lightgame.adapter.BaseRecyclerAdapter @@ -31,8 +32,10 @@ class GameFunctionAdapter( val infoTag = infoTags.getOrNull(position) ImageUtils.display(holder.binding.iconIv, infoTag?.icon) + holder.binding.nameTv.setTextColor(com.gh.gamecenter.common.R.color.text_primary.toColor(mContext)) + holder.binding.desTv.setTextColor(com.gh.gamecenter.common.R.color.text_secondary.toColor(mContext)) holder.binding.nameTv.text = infoTag?.name - holder.binding.desTv.text = infoTag?.description + holder.binding.desTv.text = infoTag?.des } } diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/GameDetailData.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/GameDetailData.kt index f6f651fe6e..3a775a7a81 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/GameDetailData.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/GameDetailData.kt @@ -207,7 +207,7 @@ data class GameDetailInfoTag( ) { data class InfoTag( val name: String = "", // 功能名称 - val description: String = "", // 功能说明 + val des: String = "", // 功能说明 val icon: String = "", // icon val color: String = "" // 颜色 )