From 1cbb505922e010cace51020773a2dc1529713322 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 06 三月 2024 16:12:58 +0800
Subject: [PATCH] 1.修改包名
---
app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/app/src/main/java/com/dayu/recharge/card/PassWordCard.java b/app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java
similarity index 70%
rename from app/src/main/java/com/dayu/recharge/card/PassWordCard.java
rename to app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java
index dfb7f81..2ed615a 100644
--- a/app/src/main/java/com/dayu/recharge/card/PassWordCard.java
+++ b/app/src/main/java/com/dayu/rechargeqh/card/PassWordCard.java
@@ -1,7 +1,8 @@
-package com.dayu.recharge.card;
+package com.dayu.rechargeqh.card;
-import com.dayu.recharge.tools.HexUtil;
-import com.dayu.recharge.utils.MyCommon;
+import com.dayu.rechargeqh.dao.AppDatabase;
+import com.dayu.rechargeqh.tools.HexUtil;
+import com.dayu.rechargeqh.utils.MyCommon;
import java.io.Serializable;
import java.util.List;
@@ -12,9 +13,9 @@
* Date: 2024-3-04 11:22
* Description:瀵嗙爜鍗�
*/
-public class PassWordCard implements Serializable {
+public class PassWordCard extends BaseCard implements Serializable {
public String cardType = MyCommon.PASS_WORD_CRAD_TYPE;//鍗＄被鍨�
- public String cardData = "A0B1C289";//鏍囪瘑鐮�
+
public String passWord;//鍏綅鐨勫瘑鐮�
public String getPassWord() {
@@ -25,24 +26,23 @@
this.passWord = passWord;
}
- public static PassWordCard getBean(List<byte[]> data){
+ public static PassWordCard getBean(List<byte[]> data) {
- if (data!=null){
- PassWordCard passWordCard=new PassWordCard();
+ if (data != null) {
+ PassWordCard passWordCard = new PassWordCard();
- byte[] zero=data.get(0);
- byte[] passWordByte=new byte[6];
+ byte[] zero = data.get(0);
+ byte[] passWordByte = new byte[6];
System.arraycopy(zero, 5, passWordByte, 0, passWordByte.length);
passWordCard.passWord = HexUtil.bytesToHex(passWordByte);
return passWordCard;
}
return null;
-
-
}
- public byte[] toByte() {
+ public byte[] toByte(AppDatabase appDatabase) {
+ setCardData(appDatabase, cardType);
Zero zero = new Zero();
return zero.toByte();
}
--
Gitblit v1.8.0