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 图标用于返还操作
---
henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java
index 64538bd..c784129 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/activity/NewCardActivity.java
@@ -11,6 +11,8 @@
import androidx.annotation.NonNull;
+import com.dayu.baselibrary.activity.BaseActivity;
+import com.dayu.baselibrary.activity.BaseNfcActivity;
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.tools.HexUtil;
import com.dayu.baselibrary.tools.Utils;
@@ -18,7 +20,7 @@
import com.dayu.baselibrary.utils.TipUtil;
import com.dayu.baselibrary.utils.ToastUtil;
import com.dayu.henanlibrary.HeNanApplication;
-import com.dayu.henanlibrary.card.UserCard;
+import com.dayu.henanlibrary.card.UserCardHN;
import com.dayu.henanlibrary.databinding.ActivityNewCardHnBinding;
import com.dayu.henanlibrary.dbBean.AdminDataBean;
import com.dayu.henanlibrary.dbBean.ElectricPriceBean;
@@ -52,7 +54,7 @@
* Date: 2023-11-10 19:52
* Description: 鏂板崱娉ㄥ唽
*/
-public class NewCardActivity extends BaseNfcActivity {
+public class NewCardActivity extends HNBaseActivity {
public static final int SCAN_IDCARD_REQUEST = 1;
UserCardBean userCardBean;
@@ -302,7 +304,7 @@
String initPeasantCode = HexUtil.bytesToHex(Arrays.copyOfRange(readData.getBodyBytes(), 10, 26));
String serial = baseDao.adminDao().findFirst().getSerial();
- UserCard userCard = new UserCard();
+ UserCardHN userCard = new UserCardHN();
userCard.setRechargeTimes(0);
ElectricPriceBean electricPriceBean = baseDao.electricPriceDao().findFirst();
--
Gitblit v1.8.0