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 图标用于返还操作
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java
index fb4443a..2db7a51 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/RegionCard.java
@@ -69,13 +69,15 @@
public byte[] toByte() {
byte[] data = new byte[16];
data[0] = HexUtil.hexToByte(cardType);
-
- byte[] regionBytes = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(region));
+ byte[] regionBytes = new byte[2];
+ byte[] regionDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(region));
+ System.arraycopy(regionDatas, 0, regionBytes, 0, regionDatas.length);
if (regionBytes != null) {
System.arraycopy(regionBytes, 0, data, 1, regionBytes.length);
}
-
- byte[] controllerCodelBytes = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(controllerCodel));
+ byte[] controllerCodelBytes = new byte[2];
+ byte[] controllerCodelDatas = HexUtil.hexToByteArray(HexUtil.get10To16LowHigh(controllerCodel));
+ System.arraycopy(controllerCodelDatas, 0, controllerCodelBytes, 0, controllerCodelDatas.length);
if (controllerCodelBytes != null) {
System.arraycopy(controllerCodelBytes, 0, data, 3, controllerCodelBytes.length);
}
--
Gitblit v1.8.0