From 0e2034dd28f74fbf6fff0aef593b586a2dd9b634 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期二, 14 十一月 2023 21:20:32 +0800
Subject: [PATCH] 修复bug

---
 src/main/java/com/ard/utils/other/ByteUtils.java |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ard/utils/other/ByteUtils.java b/src/main/java/com/ard/utils/other/ByteUtils.java
index f89e0e9..0c11f68 100644
--- a/src/main/java/com/ard/utils/other/ByteUtils.java
+++ b/src/main/java/com/ard/utils/other/ByteUtils.java
@@ -5,7 +5,10 @@
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.CRC32;
+
+import static oracle.security.pki.util.SignatureAlgorithms.i;
 
 /**
  * @Description: 瀛楄妭宸ュ叿绫�
@@ -27,6 +30,13 @@
      * byte鏁扮粍杞腑鏂囧瓧绗︿覆
      */
     public static String bytesToStringZh(byte[] bytes) {
+        //ByteBuffer buffer = ByteBuffer.wrap(bytes); // byteArray 鏄寘鍚瓧鑺傛暟缁勭殑鍙橀噺
+        //try {
+        //    return new String(buffer.array(), "GBK");
+        //} catch (UnsupportedEncodingException e) {
+        //    e.printStackTrace();
+        //}
+        //return "";
         String zhStr = "";
         try {
             int position = ByteUtils.findIndexOfDoubleZero(bytes);
@@ -71,6 +81,8 @@
      * byte鏁扮粍杞暣鍨�
      */
     public static int bytesToDecimal(byte[] byteArray) {
+        //ByteBuffer buffer = ByteBuffer.wrap(byteArray); // byteArray 鏄寘鍚瓧鑺傛暟缁勭殑鍙橀噺
+        //return buffer.getInt();
         int decimalValue = 0;
         for (int i = 0; i < byteArray.length; i++) {
             decimalValue = (decimalValue << 8) | (byteArray[i] & 0xFF);
@@ -78,12 +90,14 @@
         return decimalValue;
     }
 
+
     /**
      * byte鏁扮粍杞珼ouble
      */
     public static double bytesToDouble(byte[] byteArray) {
-        // 鍒涘缓涓�涓狟yteBuffer骞惰缃瓧鑺傞『搴忎负澶х
+        // 鍒涘缓涓�涓狟yteBuffer
         ByteBuffer buffer = ByteBuffer.wrap(byteArray);
+        //璁剧疆瀛楄妭椤哄簭涓哄ぇ绔�
         buffer.order(ByteOrder.LITTLE_ENDIAN);
         // 浠嶣yteBuffer涓幏鍙杁ouble鍊�
         double doubleValue = buffer.getDouble();
@@ -124,17 +138,19 @@
         return buffer.array();
     }
 
+
     /**
      * double杞琤yte鏁扮粍
      */
     public static byte[] doubleToBytes(double d) {
-        long value = Double.doubleToRawLongBits(d);
-        byte[] byteRet = new byte[8];
-        for (int i = 0; i < 8; i++) {
-            byteRet[i] = (byte) ((value >> 8 * i) & 0xff);
-        }
-        return byteRet;
+        // 鍒涘缓涓�涓� ByteBuffer锛屽垎閰嶈冻澶熺殑绌洪棿鏉ュ瓨鍌ㄤ竴涓� float 鍊�
+        ByteBuffer buffer = ByteBuffer.allocate(Double.BYTES);
+        // 灏� float 鍊煎啓鍏� ByteBuffer
+        buffer.putDouble(d);
+        // 鑾峰彇瀛楄妭鏁扮粍
+        return buffer.array();
     }
+
     /**
      * float杞琤yte鏁扮粍
      */
@@ -146,6 +162,7 @@
         // 鑾峰彇瀛楄妭鏁扮粍
         return buffer.array();
     }
+
     /**
      * byte鏁扮粍鎷兼帴
      */

--
Gitblit v1.9.3