From 08bfe3072377b53c60e0952f00c26bce2e5b4bc0 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 18 六月 2025 17:05:55 +0800
Subject: [PATCH] feat(card): 添加卡片返还功能- 新增 CardReturnActivity 用于执行卡片返还操作 - 在 BSCardFragment 中添加返还按钮，跳转到 CardReturnActivity - 在 CardOperationType 中添加 ReturnCard 类型 - 修改 CardReadActivity，优化卡片信息显示逻辑 - 更新 CardWriteSuccessActivity，支持返还成功提示 - 新增 ic_morny_back 图标用于返还操作
---
generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
index 73182db..7023d35 100644
--- a/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
+++ b/generallibrary/src/main/java/com/dayu/general/activity/CardWriteSuccessActivity.kt
@@ -1,8 +1,8 @@
package com.dayu.general.activity
-import android.content.Intent
import android.os.Bundle
import com.dayu.general.databinding.ActivityCardWriteSuccessBinding
+import com.dayu.general.tool.CardOperationType
/**
* @author: zuo
@@ -13,32 +13,70 @@
private lateinit var binding: ActivityCardWriteSuccessBinding
private var cardNumber: String? = null
+ private var operationTypeCode: Int = -1
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivityCardWriteSuccessBinding.inflate(layoutInflater)
setContentView(binding.root)
- // 鑾峰彇浼犲叆鐨勫崱鍙�
+ // 鑾峰彇浼犲叆鐨勫崱鍙峰拰鎿嶄綔绫诲瀷
cardNumber = intent.getStringExtra("cardNumber")
+ operationTypeCode = intent.getIntExtra("operationTypeCode", -1)
initView()
}
private fun initView() {
- // 璁剧疆鏍囬
- binding.titleBar.setCenterText("閿�鍗℃垚鍔�")
+ val operationType = CardOperationType.fromCode(operationTypeCode)
- // 璁剧疆鎴愬姛淇℃伅
- binding.successTitle.text = "閿�鍗℃垚鍔�"
-
- // 璁剧疆璇︾粏淇℃伅
- val message = if (cardNumber.isNullOrBlank()) {
- "鍗＄墖宸叉垚鍔熼攢鍗″苟娓呴櫎鍐呭\n璇ュ崱鐗囧皢鏃犳硶鍐嶆浣跨敤"
- } else {
- "鍗＄墖宸叉垚鍔熼攢鍗″苟娓呴櫎鍐呭\n鍗″彿锛�$cardNumber\n璇ュ崱鐗囧皢鏃犳硶鍐嶆浣跨敤"
+ // 鏍规嵁鎿嶄綔绫诲瀷璁剧疆涓嶅悓鐨勬爣棰樺拰淇℃伅
+ when (operationType) {
+ CardOperationType.CancelCard -> {
+ // 璁剧疆鏍囬
+ binding.titleBar.setCenterText("閿�鍗℃垚鍔�")
+
+ // 璁剧疆鎴愬姛淇℃伅
+ binding.successTitle.text = "閿�鍗℃垚鍔�"
+
+ // 璁剧疆璇︾粏淇℃伅
+ val message = if (cardNumber.isNullOrBlank()) {
+ "鍗＄墖宸叉垚鍔熼攢鍗″苟娓呴櫎鍐呭\n璇ュ崱鐗囧皢鏃犳硶鍐嶆浣跨敤"
+ } else {
+ "鍗＄墖宸叉垚鍔熼攢鍗″苟娓呴櫎鍐呭\n鍗″彿锛�$cardNumber\n璇ュ崱鐗囧皢鏃犳硶鍐嶆浣跨敤"
+ }
+ binding.successMessage.text = message
+ }
+
+ CardOperationType.ReturnCard -> {
+ // 璁剧疆鏍囬
+ binding.titleBar.setCenterText("杩旇繕鎴愬姛")
+
+ // 璁剧疆鎴愬姛淇℃伅
+ binding.successTitle.text = "杩旇繕鎴愬姛"
+
+ // 璁剧疆璇︾粏淇℃伅
+ val message = if (cardNumber.isNullOrBlank()) {
+ "鍗＄墖杩旇繕鎿嶄綔宸叉垚鍔熷畬鎴怽n鍗″唴浣欓宸叉洿鏂�"
+ } else {
+ "鍗＄墖杩旇繕鎿嶄綔宸叉垚鍔熷畬鎴怽n鍗″彿锛�$cardNumber\n鍗″唴浣欓宸叉洿鏂�"
+ }
+ binding.successMessage.text = message
+ }
+
+ else -> {
+ // 榛樿鏄剧ず鍐欏崱鎴愬姛
+ binding.titleBar.setCenterText("鍐欏崱鎴愬姛")
+ binding.successTitle.text = "鍐欏崱鎴愬姛"
+
+ val message = if (cardNumber.isNullOrBlank()) {
+ "鍗＄墖鎿嶄綔宸叉垚鍔熷畬鎴�"
+ } else {
+ "鍗＄墖鎿嶄綔宸叉垚鍔熷畬鎴怽n鍗″彿锛�$cardNumber"
+ }
+ binding.successMessage.text = message
+ }
}
- binding.successMessage.text = message
// 璁剧疆鐐瑰嚮纭畾鎸夐挳鍚庡叧闂〉闈�
binding.btnConfirm.setOnClickListener {
--
Gitblit v1.8.0