From b6779014ad6b2627d0a7e4d170d918d001fc03db Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 08 五月 2024 10:44:01 +0800
Subject: [PATCH] 1.修复16进制低位在前高位在后转换成10进制时的bug 2.完成充值相关功能 3.优化导出记录相关信息
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java | 90 ++++++++++++++++++++------------------------
1 files changed, 41 insertions(+), 49 deletions(-)
diff --git a/baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java b/baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java
index fc5f44b..189af92 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java
@@ -3,6 +3,7 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -29,9 +30,46 @@
hexString = HighLowHex(hexString);
return hexString;
}
+
+
+ /**
+ * 16杩涘埗杞�10杩涘埗骞朵笖浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
+ *
+ * @param data
+ * @return
+ */
+ public static int get16To10LowHightByBytes(byte[] data) {
+ List<Byte> byteList = new ArrayList<>();
+ for (byte b : data) {
+ byteList.add(b);
+ }
+ Collections.reverse(byteList);
+ byte[] byteArray = new byte[byteList.size()];
+ for (int i = 0; i < byteList.size(); i++) {
+ byteArray[i] = byteList.get(i);
+ }
+ String hex = bytesToHexNoAppen(byteArray);
+ return Integer.parseInt(hex, 16);
+ }
+
+ /**
+ * byte 鏁扮粍杞�16杩涘埗瀛楃涓� 涓嶅姞0鍓嶇紑
+ * @param bytes
+ * @return
+ */
+ public static String bytesToHexNoAppen(byte[] bytes) {
+ StringBuffer sb = new StringBuffer();
+ for (int i = 0; i < bytes.length; i++) {
+ String hex = Integer.toHexString(bytes[i] & 0xFF);
+ sb.append(hex);
+ }
+ return sb.toString();
+ }
+
public static int getBcdToInt(byte data) {
return ((data & 0xF0) >> 4) * 10 + ((data & 0x0F));
}
+
/**
* short10杩涘埗杞�16杩涘埗 浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
*
@@ -47,7 +85,6 @@
while (hexString.length() < 4) {
hexString = "0" + hexString;
}
-
hexString = spaceHex(hexString);
hexString = HighLowHex(hexString);
return hexString;
@@ -55,7 +92,7 @@
/**
* 灏哹yte鏁扮粍杞崲涓哄甫绗﹀彿鐨�32浣嶆诞鐐规暟
- *
+ * <p>
* 浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
*
* @param value
@@ -65,7 +102,6 @@
ByteBuffer bufferLittleEndian = ByteBuffer.wrap(value);
bufferLittleEndian.order(ByteOrder.LITTLE_ENDIAN);
return bufferLittleEndian.getFloat();
-
}
/**
@@ -82,6 +118,7 @@
byte[] byteArray = buffer.array();
return byteArray;
}
+
/**
* hex瀛楃涓茶浆byte鏁扮粍
*
@@ -152,36 +189,8 @@
return sb.toString();
}
- public static String byteArrayToHexString(byte[] byteArray) {
- StringBuilder hexString = new StringBuilder();
- for (byte b : byteArray) {
- // 灏嗗瓧鑺傝浆鎹负鏃犵鍙锋暣鏁�
- int unsignedInt = b & 0xff;
- // 灏嗘棤绗﹀彿鏁存暟杞崲涓�16杩涘埗瀛楃涓�
- String hex = Integer.toHexString(unsignedInt);
- // 濡傛灉瀛楃涓查暱搴﹀皬浜�2锛屽湪鍓嶉潰琛�0
- if (hex.length() < 2) {
- hex = "0" + hex;
- }
- hexString.append(hex);
- }
- return hexString.toString();
- }
- /**
- * 瀛楄妭鏁扮粍杞�16杩涘埗 涓嶅湪鏈熬娣诲姞0
- *
- * @param bytes 闇�瑕佽浆鎹㈢殑byte鏁扮粍
- * @return 杞崲鍚庣殑Hex瀛楃涓�
- */
- public static String bytesToHexNoAddZero(byte[] bytes) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < bytes.length; i++) {
- String hex = Integer.toHexString(bytes[i] & 0xFF);
- sb.append(hex);
- }
- return sb.toString();
- }
+
/**
@@ -248,23 +257,6 @@
e.printStackTrace();
}
return str;
- }
-
- /**
- * 16杩涘埗杞�10杩涘埗楂樹綆浣嶈浆鎹�
- * @param hex
- * @return
- */
- public static int get16to10LowHigh(String hex) {
- try {
- String str = "";
- str = spaceHex(hex);
- str = HighLowHex(str);
- return Integer.parseInt(str, 16);
- } catch (NumberFormatException e) {
- e.printStackTrace();
- }
- return 0;
}
--
Gitblit v1.8.0