From dd0f9e5f533d868d68c5fc343a44356b537b3988 Mon Sep 17 00:00:00 2001
From: zuojincheng <lf_zuo@163.com>
Date: 星期五, 06 六月 2025 15:36:45 +0800
Subject: [PATCH] feat(nfc): 新增用户卡写入功能并优化开卡流程

---
 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