From 8c57cb70cc165d21fdda9385966e8ae65d36cc1d Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 10 五月 2024 11:39:49 +0800
Subject: [PATCH] 1.修复16进制字符串转byte时的bug
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java | 41 +++++++++++++++++++++--------------------
1 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
index f1b8fa4..a0ad0da 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/ManageCard.java
@@ -1,8 +1,8 @@
package com.dayu.qihealonelibrary.card;
import com.dayu.baselibrary.tools.HexUtil;
-import com.dayu.qihealonelibrary.dao.AppDatabase;
-import com.dayu.qihealonelibrary.utils.MyCommon;
+import com.dayu.qihealonelibrary.dao.QHAloneAppDatabase;
+import com.dayu.qihealonelibrary.utils.CardCommon;
import java.io.Serializable;
@@ -13,28 +13,28 @@
* Description: 绠＄悊鍗� 绗�1鎵囧尯 0鍧�
*/
public class ManageCard extends BaseCard implements Serializable {
- public String cardType = MyCommon.MANAGE_CRAD;//鍗＄被鍨�
-// public String cardData = "A0B1C289";//鏍囪瘑鐮�
-
-
- /**
- * M1鍗＄殑0鎵囧尯0鍧楅�氬父鐢ㄤ簬瀛樺偍涓�浜涘熀鏈殑鍗＄墖淇℃伅
- * 绗�0瀛楄妭锛氬崱鐗囩被鍨嬶紙M1鍗′负0x08锛�
- * 绗�1瀛楄妭锛氬崱鐗囧湴鍧�锛堥�氬父涓�0x00锛�
- * 绗�2-5瀛楄妭锛氬崱鐗囧簭鍒楀彿锛�4瀛楄妭锛�
- * 绗�6-8瀛楄妭锛氬崱鐗囧埗閫犲晢浠ｇ爜锛�3瀛楄妭锛�
- * 绗�9瀛楄妭锛氬崱鐗囩増鏈�
- * 绗�10-15瀛楄妭锛氶鐣欏尯鍩�
- */
- public byte[] userCard; //鐢ㄦ埛鍗″彿
-
+ public String cardType = CardCommon.MANAGE_CRAD;//鍗＄被鍨�
public String getCardData() {
return cardData;
}
- public byte[] toZeroByte(AppDatabase appDatabase) {
- setCardData(appDatabase, cardType);
+ /**
+ * M1鍗＄殑0鎵囧尯0鍧楅�氬父鐢ㄤ簬瀛樺偍涓�浜涘熀鏈殑鍗＄墖淇℃伅
+ * 0-4瀛楄妭鏄崱鍙�
+ */
+ public String userCard; //鐢ㄦ埛鍗″彿
+
+ public String getUserCard() {
+ return userCard;
+ }
+
+ public void setUserCard(String userCard) {
+ this.userCard = userCard;
+ }
+
+ public byte[] toByte(QHAloneAppDatabase QHAloneAppDatabase) {
+ setCardData(QHAloneAppDatabase, cardType);
Zero zero = new Zero();
return zero.toByte();
}
@@ -47,8 +47,9 @@
byte[] cardDataByte = HexUtil.hexToByteArray(cardData);
System.arraycopy(cardDataByte, 0, data, 1, cardDataByte.length);
+ byte[] userCardByts = HexUtil.hexToByteArray(userCard);
if (userCard != null) {
- System.arraycopy(userCard, 0, data, 5, userCard.length);
+ System.arraycopy(userCardByts, 0, data, 5, userCardByts.length);
}
data[15] = getByteSum(data);
--
Gitblit v1.8.0