From 2734ff1ff2826889db50fc632d3a4ce6907384d7 Mon Sep 17 00:00:00 2001 From: wzq Date: Wed, 11 Oct 2023 17:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E9=97=B4=20"=E5=A4=BA=E5=AE=9D?= =?UTF-8?q?=E7=B2=BE=E7=81=B5"=20=E7=B2=BE=E7=81=B5=E8=AF=95=E7=82=BC?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E5=8C=BA=E5=88=86=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erban/treasurefairy/adapter/TestFairyRecordAdapter.kt | 5 +++-- .../erban/treasurefairy/dialog/TestFairyResultDialog.kt | 4 ++-- .../xchat_android_core/treasurefairy/TestFairyRecordInfo.kt | 3 ++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt index f182b4582..1ce6a7569 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/adapter/TestFairyRecordAdapter.kt @@ -19,8 +19,9 @@ class TestFairyRecordAdapter : helper.setText(R.id.tv_time_hour, formatHour.format(item.createTime)) helper.setText(R.id.tv_prize_name, item.elfName) helper.setText( - R.id.tv_prize_type, when (item.elfLevel) { - 2 -> "史詩試煉" + R.id.tv_prize_type, when (item.type) { + 4 -> "傳說試煉" + 7 -> "精靈分解" else -> "傳說試煉" } ) diff --git a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyResultDialog.kt b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyResultDialog.kt index f434c8147..e295be3e7 100644 --- a/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyResultDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/treasurefairy/dialog/TestFairyResultDialog.kt @@ -36,13 +36,13 @@ class TestFairyResultDialog : BaseDialog() .setAdapter(prizeAdapter) - .setRecyclerView(binding?.recyclerView) + .setRecyclerView(binding.recyclerView) .setLayoutManager( LinearLayoutManager(context) ) diff --git a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt index 25d2f72af..aa400ce16 100644 --- a/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt +++ b/core/src/diff_src_erban/java/com/yizhuan/xchat_android_core/treasurefairy/TestFairyRecordInfo.kt @@ -6,5 +6,6 @@ data class TestFairyRecordInfo( val elfLevel: Int = 0, val elfName: String = "", val expendList: List = listOf(), - val recordId: Long = 0 + val recordId: Long = 0, + val type: Int = 0 )