From 548dce0bcff06ee7a1795defe8e7789b9d7aad94 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 25 四月 2025 16:52:50 +0800
Subject: [PATCH] refactor(nfc): 重构 NFC 读写助手类并优化相关功能

---
 baselibrary/src/main/java/com/dayu/baselibrary/tools/HexUtil.java |  153 +++++++++++++++++++++++++++++----------------------
 1 files changed, 87 insertions(+), 66 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..0cde97f 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,8 +30,56 @@
         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 = bytesToHex(byteArray);
+        return Integer.parseInt(hex, 16);
+    }
+
+
+
     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杩涘埗 浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
@@ -47,7 +96,6 @@
         while (hexString.length() < 4) {
             hexString = "0" + hexString;
         }
-
         hexString = spaceHex(hexString);
         hexString = HighLowHex(hexString);
         return hexString;
@@ -55,7 +103,7 @@
 
     /**
      * 灏哹yte鏁扮粍杞崲涓哄甫绗﹀彿鐨�32浣嶆诞鐐规暟
-     *
+     * <p>
      * 浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗
      *
      * @param value
@@ -65,23 +113,9 @@
         ByteBuffer bufferLittleEndian = ByteBuffer.wrap(value);
         bufferLittleEndian.order(ByteOrder.LITTLE_ENDIAN);
         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鏁扮粍
      *
@@ -152,37 +186,6 @@
         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();
-    }
-
 
     /**
      * 灏� 4瀛楄妭鐨�16杩涘埗瀛楃涓诧紝杞崲涓�32浣嶅甫绗﹀彿鐨勫崄杩涘埗娴偣鍨�
@@ -202,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;
     }
 
     /**
@@ -250,23 +284,6 @@
         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;
-    }
-
 
     /**
      * 杩斿洖鐗瑰畾闀垮害鐨�16杩涘埗瀛楃涓�
@@ -290,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();
@@ -310,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