feat(card): 添加销卡功能并优化卡片信息展示

zuoxiao

12 小时以前 ec09d4bcd191496272099c2ab31d097ad630ee78

 generallibrary/src/main/java/com/dayu/general/activity/RechargeDetailActivity.kt

@@ -12,6 +12,7 @@
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.dayu.baselibrary.net.subscribers.SubscriberListener
import com.dayu.baselibrary.utils.MornyUtil
import com.dayu.baselibrary.utils.ToastUtil
import com.dayu.baselibrary.view.TitleBar
import com.dayu.general.BaseApplication
@@ -45,7 +46,12 @@
        private const val EXTRA_CARD_ADDRESS = "extra_card_address"
        private const val EXTRA_USER_CARD = "extra_user_card"

        fun start(context: Context, cardInfo: CardInfoResult?, cardAddress: String?, userCard: UserCard?) {
        fun start(
            context: Context,
            cardInfo: CardInfoResult?,
            cardAddress: String?,
            userCard: UserCard?
        ) {
            val intent = Intent(context, RechargeDetailActivity::class.java)
            intent.putExtra(EXTRA_CARD_INFO, cardInfo)
            intent.putExtra(EXTRA_CARD_ADDRESS, cardAddress)
@@ -86,7 +92,7 @@
            // 处理充值逻辑
            handleRecharge()
        }
        

        // 设置金额输入限制
        setupAmountInputLimit(binding.rechargeMorny)
        setupAmountInputLimit(binding.rechargeWater)
@@ -98,13 +104,13 @@
    private fun setupAmountInputLimit(editText: EditText) {
        editText.addTextChangedListener(object : TextWatcher {
            override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
            

            override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
            

            override fun afterTextChanged(s: Editable?) {
                val text = s.toString()
                if (text.isEmpty()) return
                

                // 检查是否包含小数点
                if (text.contains(".")) {
                    val parts = text.split(".")
@@ -120,7 +126,7 @@
                        }
                    }
                }
                

                // 防止输入多个小数点
                val dotCount = text.count { it == '.' }
                if (dotCount > 1) {
@@ -130,7 +136,7 @@
                    editText.setSelection(newText.length)
                    editText.addTextChangedListener(this)
                }
                

                // 防止以小数点开头
                if (text.startsWith(".")) {
                    editText.removeTextChangedListener(this)
@@ -249,9 +255,9 @@
            binding.redInitCode.text = cardAddress ?: ""
            binding.userName.text = info.userName ?: ""
            binding.redCardNum.text = info.cardNum ?: ""
            

            // 使用用户卡中的余额显示
            val balance = userCard?.let { 
            val balance = userCard?.let {
                // 将分转换为元，保留两位小数
                String.format("%.2f", it.balance / 100.0)
            } ?: run {
@@ -261,7 +267,7 @@
            binding.redRemainderBlance.text = "$balance 元"

            // 设置卡状态和对应颜色
            val cardStatus = when (info.status) {
            val cardStatus = when (info.state) {
                1 -> "正常"
                2 -> "挂失"
                3 -> "锁定"
@@ -271,7 +277,7 @@
            binding.redStatu.text = cardStatus

            // 根据卡状态设置不同颜色
            val statusColor = when (info.status) {
            val statusColor = when (info.state) {
                1 -> android.graphics.Color.parseColor("#4CAF50") // 绿色-正常
                2 -> android.graphics.Color.parseColor("#FF9800") // 橙色-挂失
                3 -> android.graphics.Color.parseColor("#F44336") // 红色-锁定
@@ -389,25 +395,30 @@
    /**
     * 启动写卡界面
     */
    private fun startWriteCardActivity(rechargeResult: RechargeResult, rechargeAmount: Double, bonusAmount: Double) {
    private fun startWriteCardActivity(
        rechargeResult: RechargeResult,
        rechargeAmount: Double,
        bonusAmount: Double
    ) {
        try {
            // 创建UserCard对象用于写卡
            val userCard = UserCard().apply {
                // 设置用户卡信息
                cardInfo?.let { info ->
                    userCode = info.cardNum ?: ""
                    

                    // 计算新余额：原有余额 + 充值金额 + 赠送金额
                    val originalBalance = this@RechargeDetailActivity.userCard?.balance ?: 0 // 原有余额（分）
                    val originalBalance =
                        this@RechargeDetailActivity.userCard?.balance ?: 0 // 原有余额（分）
                    val rechargeAmountInCents = (rechargeAmount * 100).toInt() // 充值金额转分
                    val bonusAmountInCents = (bonusAmount * 100).toInt() // 赠送金额转分
                    

                    balance = originalBalance + rechargeAmountInCents + bonusAmountInCents
                }
                

                // 设置其他必要信息
                projectCode = rechargeResult.projectNo
                waterPrice = rechargeResult.waterPrice.toFloat()
                waterPrice = MornyUtil.changeY2F(rechargeResult.waterPrice.toString())
                rechargeDate = java.util.Calendar.getInstance()
            }

@@ -422,7 +433,7 @@
                putExtra("bonusAmount", bonusAmount) // 传递赠送金额
            }
            startActivity(intent)

            finish()
        } catch (e: Exception) {
            ToastUtil.show("启动写卡界面失败: ${e.message}")
        }