From 27c4cbd38bb3c32d355afe16e09d62c8b6b5c092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Thu, 16 Mar 2023 21:09:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B8=B8=E6=88=8F=E9=95=9C=E5=83=8F&?= =?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=B1=8F=E8=94=BD=E7=9B=B8=E5=85=B3=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E2=80=940315=E6=B5=8B=E8=AF=95(=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E9=97=AE=E9=A2=981,2)=20https://jira.shanqu.cc/browse/GHZS-166?= =?UTF-8?q?3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/gamedetail/GameDetailFragment.kt | 8 ++++---- .../com/gh/gamecenter/gamedetail/GameDetailViewModel.kt | 4 ++-- .../gh/gamecenter/gamedetail/entity/ContentCardEntity.kt | 2 ++ .../com/gh/gamecenter/feature/entity/GameDetailServer.kt | 2 -- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt index 997d68ca74..dfb3cdf746 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt @@ -1315,9 +1315,9 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { } } } - redDotTv.goneIf(!((contentCardEntity.type == "func_server" && contentCardEntity.server?.futureTotal != 0) || contentCardEntity.type == "func_libao")) + redDotTv.goneIf(!((contentCardEntity.type == "func_server" && contentCardEntity.server?.total != 0) || contentCardEntity.type == "func_libao")) if ((contentCardEntity.type == "func_server") && (contentCardEntity.server?.calendar?.isNotEmpty() == true)) redDotTv.text = - contentCardEntity.server?.futureTotal.toString() + contentCardEntity.server?.total.toString() if ((contentCardEntity.type == "func_libao") && (contentCardEntity.libao != null)) redDotTv.text = contentCardEntity.libao?.total.toString() root.setOnClickListener { @@ -1342,7 +1342,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { ) titleTv.text = contentCardEntity.title ImageUtils.display(iconIv, contentCardEntity.icon) - redDotTv.goneIf(!((contentCardEntity.type == "func_server" && contentCardEntity.server?.futureTotal != 0) || contentCardEntity.type == "func_libao")) + redDotTv.goneIf(!((contentCardEntity.type == "func_server" && contentCardEntity.server?.total != 0) || contentCardEntity.type == "func_libao")) redDotTv.layoutParams = (redDotTv.layoutParams as ViewGroup.MarginLayoutParams).apply { setMargins( 0, @@ -1352,7 +1352,7 @@ class GameDetailFragment : ToolbarFragment(), IScrollable { ) } if ((contentCardEntity.type == "func_server") && (contentCardEntity.server?.calendar?.isNotEmpty() == true)) redDotTv.text = - contentCardEntity.server?.futureTotal.toString() + contentCardEntity.server?.total.toString() if ((contentCardEntity.type == "func_libao") && (contentCardEntity.libao != null)) redDotTv.text = contentCardEntity.libao?.total.toString() root.setOnClickListener { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt index 37cf487216..104560575c 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt @@ -285,8 +285,8 @@ class GameDetailViewModel( } val funcServer = data.contentCard.find { it.type == "func_server" } - if (funcServer != null && data.mirrorData?.server != null) { - funcServer.server = data.mirrorData?.server + if (funcServer?.mirrorServer != null) { + funcServer.server = funcServer.mirrorServer } // 有多余的镜像自定义栏目没找到位置放，统一按权重为0放到详细信息后，连权重为0也没有就放到列表最后！ diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt index e707c8cebe..edf7014b4e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt @@ -44,6 +44,8 @@ class ContentCardEntity( var des: String = "", var server: GameDetailServer? = null, + @SerializedName("mirror_server") + var mirrorServer: GameDetailServer? = null, var libao: LibaoEntity? = null, @SerializedName("zone_tab") var zoneTab: Boolean = false, diff --git a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameDetailServer.kt b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameDetailServer.kt index ac6e301686..c3af308c8d 100644 --- a/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameDetailServer.kt +++ b/module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameDetailServer.kt @@ -12,8 +12,6 @@ import kotlinx.parcelize.Parcelize class GameDetailServer( var des: String = "", var total: Int = 0, - @SerializedName("future_total") - var futureTotal: Int = 0, @SerializedName("show_des") var showDes: Boolean = false,// 显示开服说明，true、false var calendar: ArrayList = ArrayList(),