Fix bug - 历史记录 description 中%d 替换

This commit is contained in:
renhaoting 2026-01-06 14:19:10 +08:00
parent 4351f8f3c2
commit bcb11ef936
2 changed files with 15 additions and 2 deletions

View File

@ -6,6 +6,9 @@ import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.ResUtil
import com.gamedog.vididin.VidiConst
import com.gamedog.vididin.beans.RECORD_CASH_PLUS_GOLD_CONVERT
import com.gamedog.vididin.beans.RECORD_GOLD_MINUS_CONVERT_2_CASH
import com.gamedog.vididin.beans.RecordCashShow import com.gamedog.vididin.beans.RecordCashShow
import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.core.login.login.AccountManager
import com.viddin.videos.free.R import com.viddin.videos.free.R
@ -27,11 +30,16 @@ class RecordCashRvAdapter : ListAdapter<RecordCashShow, RecordCashRvAdapter.View
fun bind(data: RecordCashShow) { fun bind(data: RecordCashShow) {
binding.tvDate.text = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(data.dateMs) binding.tvDate.text = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(data.dateMs)
binding.tvTitle.text = ResUtil.getString(data.title) binding.tvTitle.text = ResUtil.getString(data.title)
binding.tvDescription.text = ResUtil.getString(data.description)
binding.ivType.setImageResource(data.iconRes) binding.ivType.setImageResource(data.iconRes)
binding.tvAmount.text = (if (data.amountNum < 0) "-" else "") + ResUtil.getString(R.string.cash) + " " + String.format("%.2f", Math.abs(data.amountNum)) binding.tvAmount.text = (if (data.amountNum < 0) "-" else "") + ResUtil.getString(R.string.cash) + " " + String.format("%.2f", Math.abs(data.amountNum))
binding.tvAmount.setTextColor(ResUtil.getColor(data.textColor)) binding.tvAmount.setTextColor(ResUtil.getColor(data.textColor))
if (data.recordType == RECORD_CASH_PLUS_GOLD_CONVERT) {
binding.tvDescription.text = String.format(ResUtil.getString(data.description), Math.abs(data.amountNum *10 * VidiConst.PER_01CASH_COST_GOLD_NUM).toInt())
} else {
binding.tvDescription.text = ResUtil.getString(data.description)
}
} }
} }

View File

@ -6,6 +6,7 @@ import androidx.recyclerview.widget.DiffUtil
import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.ResUtil
import com.gamedog.vididin.beans.RECORD_GOLD_MINUS_CONVERT_2_CASH
import com.gamedog.vididin.beans.RecordGoldShow import com.gamedog.vididin.beans.RecordGoldShow
import java.text.SimpleDateFormat import java.text.SimpleDateFormat
import com.viddin.videos.free.databinding.FragmentWithdrawRecordGoldItemBinding as ViewBinding import com.viddin.videos.free.databinding.FragmentWithdrawRecordGoldItemBinding as ViewBinding
@ -25,9 +26,13 @@ class RecordGoldRvAdapter : ListAdapter<RecordGoldShow, RecordGoldRvAdapter.View
fun bind(data: RecordGoldShow) { fun bind(data: RecordGoldShow) {
binding.tvDate.text = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(data.dateMs) binding.tvDate.text = SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(data.dateMs)
binding.tvTitle.text = ResUtil.getString(data.title) binding.tvTitle.text = ResUtil.getString(data.title)
binding.tvDescription.text = ResUtil.getString(data.description)
binding.tvAmount.text = data.amountNum.toString() binding.tvAmount.text = data.amountNum.toString()
binding.ivType.setImageResource(data.iconRes) binding.ivType.setImageResource(data.iconRes)
if (data.recordType == RECORD_GOLD_MINUS_CONVERT_2_CASH) {
binding.tvDescription.text = String.format(ResUtil.getString(data.description), Math.abs(data.amountNum))
} else {
binding.tvDescription.text = ResUtil.getString(data.description)
}
} }
} }