From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 八月 2024 09:10:27 +0800
Subject: [PATCH] 修改未关泵补卡逻辑
---
qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
index a38497e..7ceea50 100644
--- a/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
+++ b/qihealonelibrary/src/main/java/com/dayu/qihealonelibrary/card/UserCard.java
@@ -175,9 +175,9 @@
int year = (rechargeDate.get(Calendar.YEAR)) % 1000;
int month = rechargeDate.get(Calendar.MONTH) + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ラ渶瑕佸姞1
int day = rechargeDate.get(Calendar.DAY_OF_MONTH);
- byte bcdYear = (byte) ((year / 10) << 4 | ((year % 10) / 100));
- byte bcdMonth = (byte) ((month / 10) << 4 | (month % 10));
- byte bcdDay = (byte) ((day / 10) << 4 | (day % 10));
+ byte bcdYear = HexUtil.getIntToBCD(year)[0];
+ byte bcdMonth = HexUtil.getIntToBCD(month)[0];
+ byte bcdDay = HexUtil.getIntToBCD(day)[0];
data[12] = bcdYear;
data[13] = bcdMonth;
data[14] = bcdDay;
@@ -221,9 +221,9 @@
int year = (rechargeDate.get(Calendar.YEAR)) % 1000;
int month = rechargeDate.get(Calendar.MONTH) + 1; // 鏈堜唤浠�0寮�濮嬶紝鎵�浠ラ渶瑕佸姞1
int day = rechargeDate.get(Calendar.DAY_OF_MONTH);
- byte bcdYear = (byte) ((year / 10) << 4 | ((year % 10) / 100));
- byte bcdMonth = (byte) ((month / 10) << 4 | (month % 10));
- byte bcdDay = (byte) ((day / 10) << 4 | (day % 10));
+ byte bcdYear = HexUtil.getIntToBCD(year)[0];
+ byte bcdMonth = HexUtil.getIntToBCD(month)[0];
+ byte bcdDay = HexUtil.getIntToBCD(day)[0];
data[12] = bcdYear;
data[13] = bcdMonth;
data[14] = bcdDay;
--
Gitblit v1.8.0