Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-GHZS-1663' into 'dev'

Browse Source 
fix: 游戏镜像&游戏屏蔽相关优化—0315测试(补充问题1,2) https://jira.shanqu.cc/browse/GHZS-1663

See merge request halo/android/assistant-android!812
This commit is contained in:
张玉久
2023-03-16 21:16:10 +08:00
parent 32cb10853c 27c4cbd38b
commit c481d99205
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailFragment.kt
View File

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

4
app/src/main/java/com/gh/gamecenter/gamedetail/GameDetailViewModel.kt
View File

@ -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也没有就放到列表最后！

2
app/src/main/java/com/gh/gamecenter/gamedetail/entity/ContentCardEntity.kt
View File

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

2
module_core_feature/src/main/java/com/gh/gamecenter/feature/entity/GameDetailServer.kt
View File

@ -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<ServerCalendarEntity> = ArrayList(),