From 520c4343a7121d610391c41cd090c480d65d13f2 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 22 三月 2024 09:37:40 +0800
Subject: [PATCH] 读取卡片界面添加地址码字段 参数设置添加密码校验

---
 app/src/main/java/com/dayu/recharge/card/CleanUserCard.java |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/card/CleanUserCard.java b/app/src/main/java/com/dayu/recharge/card/CleanUserCard.java
index 72b6bf5..5165024 100644
--- a/app/src/main/java/com/dayu/recharge/card/CleanUserCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/CleanUserCard.java
@@ -1,6 +1,8 @@
 package com.dayu.recharge.card;
 
+import com.dayu.recharge.dao.AppDatabase;
 import com.dayu.recharge.tools.HexUtil;
+import com.dayu.recharge.utils.MyCommon;
 
 import java.io.Serializable;
 
@@ -10,22 +12,21 @@
  * Date: 2023-11-08 11:39
  * Description:鍒犻櫎鍏ㄩ儴鐢ㄦ埛鍗�
  */
-public class CleanUserCard implements Serializable {
-    public String cardType = "BB";//鍗$被鍨�
-    public String cardData = "A0B1C289";//鏍囪瘑鐮�
+public class CleanUserCard extends BaseCard implements Serializable {
+    public String cardType = MyCommon.CLEAN_ALL_USER_CARD_TYPE;//鍗$被鍨�
 
-    public byte[] toByte() {
-        Zero zero=new Zero();
-       return zero.toByte();
+    public byte[] toByte(AppDatabase appDatabase) {
+        setCardData(appDatabase, cardType);
+        Zero zero = new Zero();
+        return zero.toByte();
     }
-    public class Zero extends BaseCard {
+
+    public class Zero {
         public byte[] toByte() {
             byte[] data = new byte[16];
             data[0] = HexUtil.hexToByte(cardType);
             byte[] cardDatas = HexUtil.hexToByteArray(cardData);
-            for (int i = 0; i < 4; i++) {
-                data[i + 1] = cardDatas[i];
-            }
+            System.arraycopy(cardDatas, 0, data, 1, cardDatas.length);
             data[15] = getByteSum(data);
             return data;
         }

--
Gitblit v1.8.0