From 1831c2a6304496729fc16af624c37e299beae83e Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期二, 01 四月 2025 11:36:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt b/app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt
index f9b45f3..a12ce57 100644
--- a/app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt
+++ b/app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt
@@ -56,7 +56,7 @@
holder.firstMonthTag.text = data.firstMonthTag
holder.titleText.text = data.title
holder.subTitleText.text = data.subTitle
- holder.priceText.text = data.price
+ holder.priceText.text = data.price.toString()
holder.nextPriceText.text = data.nextPrice
holder.autoRenewText.text = data.autoRenew
@@ -68,8 +68,8 @@
val data = cardList[position] as CardData.Yearly
holder.discountTag.text = data.discountTag
holder.titleText.text = data.title
- holder.priceText.text = data.price
- holder.originalPriceText.text = data.originalPrice
+ holder.priceText.text = data.price.toString()
+ holder.originalPriceText.text = data.originalPrice.toString()
// 设置中划线
val paint = holder.originalPriceText.paint
@@ -83,7 +83,7 @@
is SingleMonthViewHolder -> {
val data = cardList[position] as CardData.SingleMonth
holder.titleText.text = data.title
- holder.priceText.text = data.price
+ holder.priceText.text = data.price.toString()
cardViewList.add(holder.cardView)
--
Gitblit v1.9.3