From 3673328730251736f9614793d9a75630c17b28f6 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期二, 13 八月 2024 09:10:27 +0800
Subject: [PATCH] 修改未关泵补卡逻辑
---
baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java | 93 ++++++++++++++++++++++++++++++----------------
1 files changed, 61 insertions(+), 32 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 189af92..0cde97f 100644
--- a/baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java
+++ b/baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java
@@ -48,28 +48,39 @@
for (int i = 0; i < byteList.size(); i++) {
byteArray[i] = byteList.get(i);
}
- String hex = bytesToHexNoAppen(byteArray);
+ String hex = bytesToHex(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));
}
+
+ public static byte[] getIntToBCD(int number) {
+ // 鑾峰彇鏁存暟鐨勫瓧绗︿覆琛ㄧず褰㈠紡
+ String numberStr = Integer.toString(number);
+
+ // 鍒涘缓涓�涓瓧鑺傛暟缁勪互瀛樺偍BCD琛ㄧず
+ int len = numberStr.length();
+ byte[] bcd = new byte[(len + 1) / 2];
+
+ int j = 0;
+ // 濡傛灉鏁板瓧鐨勯暱搴︽槸濂囨暟锛岄渶瑕佸湪鍓嶉潰娣诲姞涓�涓�0
+ if (len % 2 != 0) {
+ numberStr = "0" + numberStr; // 鍏堟坊鍔犲墠瀵奸浂
+ len++;
+ }
+
+ // 灏嗘瘡涓�瀵规暟瀛楄浆鎹负涓�涓瓧鑺�
+ for (int i = 0; i < len; i += 2) {
+ bcd[j++] = (byte) (((numberStr.charAt(i) - '0') << 4) | (numberStr.charAt(i + 1) - '0'));
+ }
+
+ return bcd;
+ }
/**
* short10杩涘埗杞�16杩涘埗 浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
*
@@ -104,20 +115,6 @@
return bufferLittleEndian.getFloat();
}
- /**
- * 灏嗗甫绗﹀彿鐨�32浣嶆诞鐐规暟瑁呮崲byte鏁扮粍
- * 浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
- *
- * @param value
- * @return
- */
- public static byte[] folatToByte(Float value) {
- ByteBuffer buffer = ByteBuffer.allocate(4); // 4涓瓧鑺�
- buffer.order(ByteOrder.LITTLE_ENDIAN);
- buffer.putFloat(value);
- byte[] byteArray = buffer.array();
- return byteArray;
- }
/**
* hex瀛楃涓茶浆byte鏁扮粍
@@ -190,9 +187,6 @@
}
-
-
-
/**
* 灏� 4瀛楄妭鐨�16杩涘埗瀛楃涓诧紝杞崲涓�32浣嶅甫绗﹀彿鐨勫崄杩涘埗娴偣鍨�
*
@@ -211,6 +205,37 @@
*/
public static String folatToHexString(Float value) {
return Integer.toHexString(Float.floatToIntBits(value));
+ }
+
+
+ /**
+ * float杞琀ex浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
+ *
+ * @param value
+ * @return
+ */
+ public static String floatToHexLowHigh(Float value) {
+ String hexString = Integer.toHexString(Float.floatToIntBits(value));
+ hexString = spaceHex(hexString);
+ hexString = HighLowHex(hexString);
+ return hexString;
+ }
+
+
+ public static float hexToFloatLowHigh(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 = bytesToHex(byteArray);
+ int intValue = Integer.parseInt(hex, 16); // 灏嗗崄鍏繘鍒跺瓧绗︿覆杞崲涓烘暣鏁拌〃绀�
+ float floatValue = Float.intBitsToFloat(intValue); // 灏嗘暣鏁拌〃绀鸿浆鎹负娴偣鏁�
+ return floatValue;
}
/**
@@ -282,6 +307,10 @@
* @return
*/
public static String spaceHex(String str) {
+ if (str.length() % 2 != 0) {
+ //濂囨暟鏃跺墠闈㈠姞0琛ラ綈绉颁负鍋舵暟
+ str = "0" + str;
+ }
char[] array = str.toCharArray();
if (str.length() <= 2) return str;
StringBuffer bufferHex = new StringBuffer();
@@ -302,7 +331,7 @@
* @param str
* @return
*/
- private static String HighLowHex(String str) {
+ public static String HighLowHex(String str) {
if (str.trim().length() <= 2) return str;
List<String> list = Arrays.asList(str.split(" "));
Collections.reverse(list);
--
Gitblit v1.8.0