From 465c8abaa982fba6868a900d25316c70afc20fb7 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期三, 18 六月 2025 13:59:46 +0800 Subject: [PATCH] feat(card): 优化销卡功能并添加写卡操作 --- generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt | 314 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 299 insertions(+), 15 deletions(-) diff --git a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt index 202d43b..3bf4fce 100644 --- a/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt +++ b/generallibrary/src/main/java/com/dayu/general/activity/NfcWreatActivity.kt @@ -2,19 +2,49 @@ import android.content.Intent import android.os.Bundle -import com.dayu.general.bean.card.CardCommon +import androidx.lifecycle.lifecycleScope +import com.dayu.baselibrary.net.subscribers.SubscriberListener +import com.dayu.baselibrary.tools.nfc.NFCCallBack +import com.dayu.baselibrary.utils.MornyUtil +import com.dayu.baselibrary.utils.ToastUtil +import com.dayu.general.bean.card.ClearCard +import com.dayu.general.bean.card.UserCard +import com.dayu.general.tool.CardCommon +import com.dayu.general.tool.CardOperationType import com.dayu.general.databinding.ActivityNfcWriteGeBinding +import com.dayu.general.net.ApiManager +import com.dayu.general.net.BaseResponse +import com.dayu.general.tool.NfcReadHelper +import com.dayu.general.tool.NfcWreatHelper +import com.dayu.general.dao.BaseDaoSingleton +import com.tencent.bugly.crashreport.CrashReport +import kotlinx.coroutines.launch +import java.lang.StringBuilder /** * @author: zuo * @date: 2021/3/30 * @description:鍐欏崱鐣岄潰 */ -class NfcWreatActivity:BaseNfcActivity() { - - var binding:ActivityNfcWriteGeBinding? = null - +class NfcWreatActivity : BaseNfcActivity() { + var binding: ActivityNfcWriteGeBinding? = null var cardType = "" + var cardAddr = "" + var cardFee = 0 + + // 鍏呭�肩浉鍏抽噾棰� + private var rechargeAmount = 0.0 + private var bonusAmount = 0.0 + + // 閿�鍗$浉鍏充俊鎭� + private var refundAmount = 0.0 + private var cardBalance = 0.0 + + //璁㈠崟缂栧彿 + var orderNumber = "" + private lateinit var userCard: UserCard + private var operationTypeCode = -1; + private var operationType: CardOperationType? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -26,23 +56,277 @@ /** * 鑾峰彇鏁版嵁 */ - private fun getInitData(){ - cardType= intent?.getStringExtra("cardType")?:"" - } + private fun getInitData() { + cardType = intent?.getStringExtra("cardType") ?: "" + cardAddr = intent?.getStringExtra("cardAddr") ?: "" + operationTypeCode = intent?.getIntExtra("operationTypeCode", -1) ?: -1 + orderNumber = intent?.getStringExtra("orderNumber") ?: "" + operationType = CardOperationType.fromCode(operationTypeCode) - private fun setTextData(){ - when(cardType){ - CardCommon.CHECK_CARD->{ - binding?.cardData?.text = "鍐欑敤鎴峰崱" + // 鑾峰彇鍏呭�肩浉鍏抽噾棰� + rechargeAmount = intent?.getDoubleExtra("rechargeAmount", 0.0) ?: 0.0 + bonusAmount = intent?.getDoubleExtra("bonusAmount", 0.0) ?: 0.0 + + // 鑾峰彇閿�鍗$浉鍏充俊鎭� + refundAmount = intent?.getDoubleExtra("refundAmount", 0.0) ?: 0.0 + cardBalance = intent?.getDoubleExtra("cardBalance", 0.0) ?: 0.0 + + if (intent?.hasExtra("cardFee") == true) { + cardFee = intent?.getIntExtra("cardFee", 0) ?: 0 + } + if (intent?.hasExtra("userCard") == true) { + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.TIRAMISU) { + userCard = intent?.getSerializableExtra("userCard", UserCard::class.java)!! + } else { + userCard = (intent?.getSerializableExtra("userCard") as? UserCard)!! } } - } - override fun onNfcBack(intent: Intent?) { - TODO("Not yet implemented") + if (operationTypeCode != -1) { + when (operationType) { + CardOperationType.CleanCard -> { + val textData = StringBuilder() + // 鍒ゆ柇鏄惁鏉ヨ嚜閿�鍗℃搷浣滐紙鏈夐��娆鹃噾棰濇垨鍗″唴浣欓淇℃伅锛� + if (refundAmount > 0 || cardBalance > 0) { + textData.append("閿�鍗℃竻闆舵搷浣淺n") + textData.append("鍗″湴鍧�锛�$cardAddr\n") + if (cardBalance > 0) { + textData.append("鍗″唴浣欓锛�${String.format("%.2f", cardBalance)}鍏僜n") + } + if (refundAmount > 0) { + textData.append("閫�娆鹃噾棰濓細${String.format("%.2f", refundAmount)}鍏�") + } else { + textData.append("鏃犻��娆鹃噾棰�") + } + } else { + textData.append("娓呴浂鍗″啓鍗�") + } + + binding?.cardData?.text = textData.toString() + } + + CardOperationType.OpenCard -> { + var textData = StringBuilder() + textData.append("鐢ㄦ埛寮�鍗n") + if (cardFee != 0) { + textData.append("宸ユ湰璐癸細" + cardFee + "鍏僜n") + } + if (userCard.balance != 0) { + textData.append("鍏呭�奸噾棰濓細" + MornyUtil.changeF2Y(userCard.balance) + "鍏�") + } + + binding?.cardData?.text = textData.toString() + } + + CardOperationType.Recharge -> { + var textData = StringBuilder() + textData.append("鐢ㄦ埛鍏呭�糪n") + + // 鏄剧ず鍏呭�奸噾棰� + if (rechargeAmount > 0) { + textData.append( + "鍏呭�奸噾棰濓細" + String.format( + "%.2f", + rechargeAmount + ) + "鍏僜n" + ) + } + + // 鏄剧ず璧犻�侀噾棰� + if (bonusAmount > 0) { + textData.append("璧犻�侀噾棰濓細" + String.format("%.2f", bonusAmount) + "鍏僜n") + } + + // 鏄剧ず鎬婚噾棰濓紙鍐欏叆鍗″唴鐨勬�讳綑棰濓級 + if (userCard.balance != 0) { + val totalBalanceInYuan = userCard.balance / 100.0 // 杞崲涓哄厓 + textData.append( + "鍗″唴鎬讳綑棰濓細" + String.format( + "%.2f", + totalBalanceInYuan + ) + "鍏�" + ) + } + + binding?.cardData?.text = textData.toString() + } + + CardOperationType.CancelCard -> { + var textData = StringBuilder() + textData.append("閿�鍗n") + textData.append("鍗″唴浣欓锛�" + MornyUtil.changeF2Y(userCard.balance) + "鍏僜n") + textData.append("閫�娆鹃噾棰濓細" + refundAmount + "鍏�") + binding?.cardData?.text = textData.toString() + } + + CardOperationType.CheckCard -> TODO() + CardOperationType.DeductCard -> TODO() + CardOperationType.ReplaceCard -> TODO() + null -> TODO() + } + } } + + + override fun onNfcBack(intent: Intent) { + val nfcReadHelper = NfcReadHelper.getInstance(intent, this) + // 浣跨敤姝e父鐨刧etCardNumber()鏂规硶锛屽畠浼氳嚜鍔ㄥ叧闂繛鎺� + val cardNumber = nfcReadHelper.getCardNumber() + + if (cardNumber.isNotEmpty() && cardNumber == cardAddr) { + val nfcWreatHelper = NfcWreatHelper.getInstance(intent, this) + when (operationType) { + CardOperationType.CleanCard -> { + var clearCard = ClearCard() + nfcWreatHelper.writeData(clearCard.getZeroBytes(), 7, 0) { success, message -> + // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢� + runOnUiThread { + if (success) { + postCardData(cardAddr) + ToastUtil.show("鍐欏崱鎴愬姛!") + } else { + // 澶勭悊鍐欏崱澶辫触鐨勬儏鍐� + ToastUtil.show(message) + } + } + } + } + + CardOperationType.OpenCard -> { + nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack { + override fun isSusses(flag: Boolean, msg: String?) { + // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢� + runOnUiThread { + if (flag) { + postCardData(cardAddr) + + } else { + ToastUtil.show("鍐欏崱澶辫触: ${msg ?: "鏈煡閿欒"}") + } + } + } + }) + + } + + CardOperationType.Recharge -> { + nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack { + override fun isSusses(flag: Boolean, msg: String?) { + // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢� + runOnUiThread { + if (flag) { + postCardData(cardAddr) + } else { + ToastUtil.show("鍏呭�煎啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}") + } + } + } + }) + } + + CardOperationType.CancelCard -> { + var userCard = UserCard() + userCard.cardType = "00"; + nfcWreatHelper.writeUserDataAsync(userCard, object : NFCCallBack { + override fun isSusses(flag: Boolean, msg: String?) { + // 纭繚Toast鍦ㄤ富绾跨▼涓皟鐢� + runOnUiThread { + if (flag) { + postCardData(cardAddr) + } else { + ToastUtil.show("閿�鍗″啓鍗″け璐�: ${msg ?: "鏈煡閿欒"}") + } + } + } + }) + } + + CardOperationType.CheckCard -> TODO() + CardOperationType.DeductCard -> TODO() + CardOperationType.ReplaceCard -> TODO() + null -> TODO() + } + } else { + ToastUtil.show("鍗$墖閿欒锛屽綋鍓嶅埛鐨勫崱涓庡垰鍒氱殑鍗′笉涓�鑷�") + } + } + + /** + * 鏇存柊CardRegistrationBean涓殑isCardWritten鐘舵�佷负true + */ + private fun updateCardWrittenStatus(cardNumber: String) { + lifecycleScope.launch { + try { + val cardRegistrationDao = BaseDaoSingleton.getInstance(this@NfcWreatActivity) + .cardRegistrationDao() + + // 鏍规嵁鍗″彿鏌ユ壘CardRegistrationBean璁板綍 + val cardRegistration = cardRegistrationDao.getByCardNumber(cardNumber) + if (cardRegistration != null) { + // 鍒涘缓鏇存柊鍚庣殑CardRegistrationBean瀵硅薄锛屽皢isCardWritten璁剧疆涓簍rue + val updatedCardRegistration = cardRegistration.copy(isCardWritten = true) + // 鏇存柊鏁版嵁搴撹褰� + cardRegistrationDao.update(updatedCardRegistration) + + // 鍦ㄤ富绾跨▼涓叧闂瑼ctivity + runOnUiThread { + setResult(RESULT_OK) + finish() + Intent(this@NfcWreatActivity, CardWriteSuccessActivity::class.java).apply { + putExtra("cardNumber", cardNumber) + startActivity(this) + } + } + } + } catch (e: Exception) { + CrashReport.postCatchedException(e) + e.printStackTrace() + runOnUiThread { + ToastUtil.show("鏇存柊鍐欏崱鐘舵�佸け璐�: ${e.message}") + } + } + } + } + + fun postCardData(cardAddr: String) { + + val map = mutableMapOf<String, Any>() + + if (cardAddr.isNotEmpty()) { + map["cardAddr"] = cardAddr + } + + map["operateType"] = operationTypeCode + if (orderNumber.isNotEmpty()) { + map["orderNumber"] = orderNumber + } + // 浣跨敤姝g‘鐨勭被鍨嬪弬鏁� + ApiManager.getInstance().requestPostLoading( + this, + "terminal/card/termCallBack", + String::class.java, + map, + object : SubscriberListener<BaseResponse<String>>() { + override fun onNext(t: BaseResponse<String>) { + if (t.success) { + updateCardWrittenStatus(cardAddr) + } else { + // 澶勭悊鎼滅储澶辫触鐨勬儏鍐� + ToastUtil.show(t.msg) + } + } + + override fun onError(e: Throwable?) { + super.onError(e) + ToastUtil.show("涓婃姤澶辫触: ${e?.message ?: "鏈煡閿欒"}") + } + } + ) + } + + } \ No newline at end of file -- Gitblit v1.8.0