From 9d57ea9c1ca983a8990dfb3791165c6bae28f483 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 09 五月 2024 16:48:50 +0800
Subject: [PATCH] 1.修复河南版本不能自动连接服务器的bug 2.添加重新选择版本的功能
---
henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java b/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java
index dd5a379..9faa0db 100644
--- a/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java
+++ b/henanlibrary/src/main/java/com/dayu/henanlibrary/card/UserCard.java
@@ -2,7 +2,7 @@
import com.dayu.baselibrary.tools.BcdUtil;
import com.dayu.baselibrary.tools.HexUtil;
-import com.dayu.henanlibrary.utils.MyCommon;
+import com.dayu.henanlibrary.utils.CardCommon;
import java.io.Serializable;
import java.util.Calendar;
@@ -15,11 +15,11 @@
* Description: 鐢ㄦ埛鍗＄粨鏋�
*/
public class UserCard extends BaseCard implements Serializable {
- public String cardType = MyCommon.USER_CARD_TYPE_1;//鍐欏崱鏍囧織 A1鍒峰崱寮�娉靛墠 A8鍒峰崱寮�娉靛悗 A2鍙犲姞鍏呭��
+ public String cardType = CardCommon.USER_CARD_TYPE_1;//鍐欏崱鏍囧織 A1鍒峰崱寮�娉靛墠 A8鍒峰崱寮�娉靛悗 A2鍙犲姞鍏呭��
public int rechargeTimes;//鍏呭�兼鏁�
- public short swipeNumber;//鍒峰崱娆℃暟 涓�鑸笉鐢ㄧ簿缁嗙鎺ф墠鐢�
+ public int swipeNumber;//鍒峰崱娆℃暟 涓�鑸笉鐢ㄧ簿缁嗙鎺ф墠鐢�
public float electricityPrice;//鐢甸噺鍗曚环 绠＄悊鍏冨彲浠ヤ慨鏀�
@@ -72,12 +72,14 @@
byte[] electricityPriceBytes = new byte[4];
System.arraycopy(zero, 4, electricityPriceBytes, 0, electricityPriceBytes.length);
- userCard.electricityPrice = HexUtil.hexToFloat(HexUtil.bytesToHex(electricityPriceBytes));
+ userCard.electricityPrice = HexUtil.hexToFloatLowHigh(electricityPriceBytes);
userCard.state = BcdUtil.bcdToStr(zero[8]);
byte[] balanceBytes = new byte[4];
System.arraycopy(zero, 9, balanceBytes, 0, balanceBytes.length);
- userCard.balance = HexUtil.get16to10LowHigh(HexUtil.bytesToHex(balanceBytes));
+
+// userCard.balance = HexUtil.get16to10LowHigh(HexUtil.bytesToHex(balanceBytes));
+ userCard.balance = HexUtil.get16To10LowHightByBytes(balanceBytes);
byte[] addressCodeBytes = new byte[6];
System.arraycopy(zero, 13, addressCodeBytes, 0, 2);
System.arraycopy(two, 11, addressCodeBytes, 2, 4);
@@ -152,7 +154,7 @@
System.arraycopy(swipeNumbers, 0, data, 2, swipeNumbers.length);
- byte[] electricityPrices = HexUtil.hexToByteArray(HexUtil.folatToHexString(electricityPrice));
+ byte[] electricityPrices = HexUtil.hexToByteArray(HexUtil.floatToHexLowHigh(electricityPrice));
System.arraycopy(electricityPrices, 0, data, 4, electricityPrices.length);
try {
@@ -251,11 +253,11 @@
}
- public short getSwipeNumber() {
+ public int getSwipeNumber() {
return swipeNumber;
}
- public void setSwipeNumber(short swipeNumber) {
+ public void setSwipeNumber(int swipeNumber) {
this.swipeNumber = swipeNumber;
}
--
Gitblit v1.8.0