From 88b00f3fc74446a1727c93722c7b64179b45a9db Mon Sep 17 00:00:00 2001
From: zhujie <leon.zhu@cloudroam.com.cn>
Date: 星期五, 18 四月 2025 17:40:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.96.225.205:8888/r/FirstApp2
---
app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 9f1b699..a12ce57 100644
--- a/app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt
+++ b/app/src/main/java/com/example/firstapp/adapter/CardAdapter.kt
@@ -9,7 +9,7 @@
import androidx.cardview.widget.CardView
import androidx.recyclerview.widget.RecyclerView
import com.example.firstapp.R
-import com.example.firstapp.entity.CardData
+import com.example.firstapp.model.CardData
class CardAdapter(private val cardList: List<CardData>,
@@ -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