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/UserCard.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/dayu/recharge/card/UserCard.java b/app/src/main/java/com/dayu/recharge/card/UserCard.java
index 93a8656..22ea997 100644
--- a/app/src/main/java/com/dayu/recharge/card/UserCard.java
+++ b/app/src/main/java/com/dayu/recharge/card/UserCard.java
@@ -76,10 +76,9 @@
                 System.arraycopy(zero,9,balanceBytes,0,balanceBytes.length);
 
                 userCard.balance = HexUtil.get16to10LowHigh(HexUtil.bytesToHex(balanceBytes));
-
                 byte[] addressCodeBytes = new byte[6];
                 System.arraycopy(zero,13,addressCodeBytes,0,2);
-                System.arraycopy(two,11,addressCodeBytes,0,4);
+                System.arraycopy(two,11,addressCodeBytes,2,4);
                 userCard.addressCode = BcdUtil.bcdToStr(addressCodeBytes);
 
                 int year = 0;
@@ -115,7 +114,7 @@
                 calendar.set(2000 + year, month, day, hour, minute, second);
                 byte[] initPeasantCodeBytes = new byte[16];
                 System.arraycopy(one,10,initPeasantCodeBytes,0,5);
-                System.arraycopy(two,0,initPeasantCodeBytes,0,11);
+                System.arraycopy(two,0,initPeasantCodeBytes,5,11);
                 userCard.initPeasantCode = HexUtil.bytesToHex(initPeasantCodeBytes);
                 return userCard;
             }
@@ -203,7 +202,7 @@
                 data[9] = bcdSecond;
             }
             byte[] initPeasantCodes = HexUtil.hexToByteArray(initPeasantCode);
-            System.arraycopy(initPeasantCodes, 5, data, 0, 5);
+            System.arraycopy(initPeasantCodes, 0, data, 10, 5);
             data[15] = getByteSum(data);
             return data;
         }

--
Gitblit v1.8.0