From 7c98e347015e96a7683dbb08b36495c75c54bea5 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 28 十一月 2023 08:33:22 +0800
Subject: [PATCH] 回退

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java |  444 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 209 insertions(+), 235 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
index 31a6248..7b06e4d 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/ByteUtil.java
@@ -9,7 +9,7 @@
 	 * 灏嗗瓧鑺傛暟缁勫悎骞跺埌瀛楄妭鏁扮粍涓�
 	 * @param bGroup1 琚悎骞舵暟缁�
 	 * @param bGroup2 鍚堝苟鏁扮粍
-	 * @return 杩斿洖 鍚堝苟鍚庢暟缁�
+	 * @return 鍚堝苟鍚庢暟缁�
 	 */
 	public static byte[] bytesMerge(byte[] bGroup1, byte[] bGroup2){
 		if(bGroup1 == null && bGroup2 == null){
@@ -29,11 +29,11 @@
 
 	/**
 	 * 鍒ゆ柇鎵�鏈夊瓧鑺傛槸鍚︿负0xFF
-	 * @param bs 瀛楄妭鏁扮粍
-	 * @param index 涓嬫爣浣�
-	 * @param len 闀垮害
-	 * @return 杩斿洖 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @param bs
+	 * @param index
+	 * @param len
+	 * @return
+	 * @throws Exception
 	 */
 	public static boolean bytesIsAll0xFF(byte[] bs, int index, int len)throws Exception {
 		int count = 0 ;
@@ -42,14 +42,14 @@
 				count++ ;
 			}
 		}
-		return count == len;
+		return count==len?true:false ;
 	}
-
+	
 	/**
 	 * 浜岃繘鍒惰浆鍗佽繘鍒舵暟
 	 * @param str
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static int binary2Int(String str) throws Exception {
         int cnt=0;
@@ -69,13 +69,13 @@
         return sum;
     }
 
-
+	
 	/**
 	 * 瀛楄妭杞瓨浜岃繘鍒�
-	 *
+	 * 
 	 * @param b byte
-	 * @throws Exception 寮傚父
-	 * @return 杩斿洖 String
+	 * @throws Exception
+	 * @return String
 	 */
 	public static String byte2Binary(byte b) throws Exception {
 		int n = (b + 256) % 256 + 256;
@@ -87,11 +87,11 @@
 	}
 	/**
 	 * 瀛楄妭杞瓨8浣嶄簩杩涘埗
-	 *
+	 * 
 	 * @param b
 	 *            byte
-	 * @throws Exception 寮傚父
-	 * @return 杩斿洖 String
+	 * @throws Exception
+	 * @return String
 	 */
 	public static String byte2bit8Binary(byte b) throws Exception {
 		String s = byte2Binary(b);
@@ -101,13 +101,13 @@
 		}
 		return s;
 	}
-
+	
 	/**
 	 * 瀛楄妭鍙朾it
 	 * @param b
-	 * @param b
-	 * @throws Exception 寮傚父
-	 * @return 杩斿洖 String
+	 * @param index
+	 * @throws Exception
+	 * @return String
 	 */
 	public static byte[] getBit(byte b) throws Exception {
 		byte[] bs = new byte[8] ;
@@ -125,9 +125,9 @@
 	/**
 	 * 瀛楄妭鍙朾it
 	 * @param b
-	 * @param index 涓嬫爣浣�
-	 * @throws Exception 寮傚父
-	 * @return 杩斿洖 String
+	 * @param index
+	 * @throws Exception
+	 * @return String
 	 */
 	public static byte getBit(byte b, byte index) throws Exception {
 		if(index == 0){
@@ -153,11 +153,11 @@
 
 	/**
 	 * 涓�涓瓧鑺傝浆姝f暣鏁�
-	 *
+	 * 
 	 * @param b
 	 *            byte
-	 * @throws Exception 寮傚父
-	 * @return 杩斿洖 String
+	 * @throws Exception
+	 * @return String
 	 */
 	public static Short byte2PlusInt(byte b) throws Exception {
 		short v = b ;
@@ -167,13 +167,13 @@
 		return v ;
 	}
 
-
+	
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * double杞崲byte
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
+	 * @param bs byte[]
 	 * @param value double double绫诲瀷鐨勫弬鏁�
-	 * @param from 寮�濮嬩綅 int
+	 * @param from int
 	 */
 	public static void double2Bytes_BE(byte[] bs, double value, int from)throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 8);
@@ -188,9 +188,9 @@
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * double杞崲byte锛屽瓧鑺傞『搴忔槸鍊掔殑
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
+	 * @param bs byte[]
 	 * @param value double double绫诲瀷鐨勫弬鏁�
-	 * @param from 寮�濮嬩綅 int
+	 * @param from int
 	 */
 	public static void double2Bytes_LE(byte[] bs, double value, int from)throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 8);
@@ -205,8 +205,8 @@
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * byte杞崲double
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @param from 寮�濮嬩綅 int
+	 * @param bs byte[]
+	 * @param from int
 	 */
 	public static double bytes2Double_BE(byte[] bs, int from) throws Exception {
 		long l = bytes2Long_BE(bs, from);
@@ -216,8 +216,8 @@
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * byte杞崲double锛屽瓧鑺傞『搴忔槸鍊掔殑
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @param from 寮�濮嬩綅 int
+	 * @param bs byte[]
+	 * @param from int
 	 */
 	public static double bytes2Double_LE(byte[] bs, int from) throws Exception {
 		long l = bytes2Long_LE(bs, from);
@@ -306,7 +306,7 @@
 
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
-	 * 杞崲long鍨嬩负byte鏁扮粍
+	 * 杞崲long鍨嬩负byte鏁扮粍 
 	 * @value bs byte[]
 	 * @value value long
 	 * @value from int
@@ -315,8 +315,8 @@
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 8);
 		if (b) {
 			for (int i = 0; i < 8; i++) {
-				bs[from + i] = Long.valueOf(value & 0xff).byteValue();
-				value = value >> 8;
+				bs[from + i] = Long.valueOf(value & 0xff).byteValue(); 
+				value = value >> 8;  
 			if(value == 0){
 				break ;
 			}
@@ -325,12 +325,12 @@
 			throw new Exception("long2Bytes鏃舵暟缁勮秺鐣�");
 		}
 	}
-
+	
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 8浣嶅瓧鑺傛暟缁勮浆鎹负闀挎暣鍨�
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @return 杩斿洖
+	 * @param bs byte[]
+	 * @return
 	 */
 	public static long bytes2Long_BE(byte[] bs) {
 		int len = bs.length ;
@@ -347,16 +347,16 @@
 				l = l | ls[i] ;
 			}
 			return l;
-		}
+		} 
 		return 0L ;
 	}
-
+		
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 8浣嶅瓧鑺傛暟缁勮浆鎹负闀挎暣鍨�
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @param from 寮�濮嬩綅 int
-	 * @return 杩斿洖
+	 * @param bs byte[]
+	 * @param from int
+	 * @return
 	 */
 	public static long bytes2Long_BE(byte[] bs, int from) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 8);
@@ -388,10 +388,10 @@
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 8浣嶅瓧鑺傛暟缁勮浆鎹负闀挎暣鍨�
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @param from 寮�濮嬩綅 int
+	 * @param bs byte[]
+	 * @param from int
 	 * @param end int
-	 * @return 杩斿洖
+	 * @return
 	 */
 	public static long bytes2Long_BE(byte[] bs, int from, int end) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, end);
@@ -414,13 +414,13 @@
 		}
 	}
 
-
-
+	
+	
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * 8浣嶅瓧鑺傛暟缁勮浆鎹负闀挎暣鍨�
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @return 杩斿洖
+	 * @param bs byte[]
+	 * @return
 	 */
 	public static long bytes2Long_LE(byte[] bs) {
 		int len = bs.length ;
@@ -437,16 +437,16 @@
 				l = l | ls[i] ;
 			}
 			return l;
-		}
+		} 
 		return 0L ;
 	}
 
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
-	 * 8浣嶅瓧鑺傛暟缁勮浆鎹负闀挎暣鍨�
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @param from 寮�濮嬩綅 int
-	 * @return 杩斿洖
+	 * 8浣嶅瓧鑺傛暟缁勮浆鎹负闀挎暣鍨� 
+	 * @param bs byte[]
+	 * @param from int
+	 * @return
 	 */
 	public static long bytes2Long_LE(byte[] bs, int from) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 8);
@@ -479,10 +479,10 @@
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * 8浣嶅瓧鑺傛暟缁勮浆鎹负闀挎暣鍨�
-	 * @param bs 瀛楄妭鏁扮粍 byte[]
-	 * @param from 寮�濮嬩綅 int
+	 * @param bs byte[]
+	 * @param from int
 	 * @param end int
-	 * @return 杩斿洖
+	 * @return
 	 */
 	public static long bytes2Long_LE(byte[] bs, int from, int end) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, end);
@@ -551,9 +551,8 @@
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 4浣嶅瓧鑺傛暟缁勮浆鎹负鏁村瀷
-	 * @param bs 瀛楄妭鏁扮粍
-	 * @param from 寮�濮嬩綅
-	 * @return 杩斿洖
+	 * @param b
+	 * @return
 	 */
 	public static int bytes2Int_BE(byte[] bs, int from) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 4);
@@ -574,13 +573,13 @@
 			throw new Exception("byte2Int鏃舵暟缁勮秺鐣�");
 		}
 	}
-
+	
 
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * 4浣嶅瓧鑺傛暟缁勮浆鎹负鏁村瀷锛屽瓧鑺傞『搴忔槸鍊掔殑
-	 * @param bs 瀛楄妭鏁扮粍 瀛楄妭鏁扮粍
-	 * @return 杩斿洖
+	 * @param b
+	 * @return
 	 */
 	public static int bytes2Int_LE(byte[] bs, int from) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 4);
@@ -601,7 +600,7 @@
 			throw new Exception("byte2Int鏃舵暟缁勮秺鐣�");
 		}
 	}
-
+	
 
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
@@ -675,14 +674,14 @@
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 2浣嶅瓧鑺傛暟缁勮浆鎹负鐭暣鍨�
-	 * @param bs 瀛楄妭鏁扮粍 瀛楄妭鏁扮粍
-	 * @return 杩斿洖
+	 * @param b
+	 * @return
 	 */
 	public static short bytes2Short_BE(byte[] bs, int from) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 2);
 		if (b) {
 			int s = 0;
-			int s0 = bs[from + 0] ;
+			int s0 = bs[from + 0] ; 
 			int s1 = bs[from + 1] ;
 
 			// s1涓嶅彉
@@ -698,14 +697,14 @@
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * 2浣嶅瓧鑺傛暟缁勮浆鎹负鐭暣鍨嬶紝瀛楄妭椤哄簭鏄�掔殑
-	 * @param bs 瀛楄妭鏁扮粍 瀛楄妭鏁扮粍
-	 * @return 杩斿洖
+	 * @param b
+	 * @return
 	 */
 	public static short bytes2Short_LE(byte[] bs, int from) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, (from - 1) + 2);
 		if (b) {
 			int s = 0;
-			int s0 = bs[from + 0] ;
+			int s0 = bs[from + 0] ; 
 			int s1 = bs[from + 1] ;
 
 			// s0涓嶅彉
@@ -719,11 +718,11 @@
 	}
 	/**
 	 * 瀛楃鍒颁竴瀛楄妭杞崲
-	 *
+	 * 
 	 * @value bs byte[]
 	 * @value ch char char绫诲瀷鐨勫弬鏁�
 	 * @value index int
-	 * @return 杩斿洖
+	 * @return
 	 */
 	public static void char2Bytes(byte[] bs, char ch, int index)throws Exception {
 		boolean b = isOutOfArrLength(bs.length, index);
@@ -736,9 +735,10 @@
 
 	/**
 	 * 涓�瀛楄妭杞崲涓哄瓧绗�
-	 * @param bs 瀛楄妭鏁扮粍 瀛楄妭鏁扮粍
+	 * 
+	 * @param b
 	 * @value index int
-	 * @return 杩斿洖
+	 * @return
 	 */
 	public static char bytes2Char(byte[] bs, int index) throws Exception {
 		boolean b = isOutOfArrLength(bs.length, index);
@@ -751,13 +751,13 @@
 
 	/**
 	 * 瀛楃涓插瀷鏁板瓧杞垚byte
-	 *
+	 * 
 	 * @param s
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static byte string2byte(String s) throws Exception {
-		int n ;
+		int n = 0;
 		try {
 			n = Integer.parseInt(s);
 		} catch (Exception e) {
@@ -772,7 +772,7 @@
 	 * @value bs byte[]
 	 * @value str String
 	 * @value from int
-	 * @return 杩斿洖
+	 * @return
 	 * @throws java.io.UnsupportedEncodingException
 	 */
 	public static int string2Bytes_BE(byte[] bs, String str, int from, int end)throws Exception {
@@ -798,7 +798,7 @@
 	 * @value bs byte[]
 	 * @value str String
 	 * @value from int
-	 * @return 杩斿洖
+	 * @return
 	 * @throws java.io.UnsupportedEncodingException
 	 */
 	public static int string2Bytes_LE(byte[] bs, String str, int from, int end)throws Exception {
@@ -824,7 +824,7 @@
 	 * @value bs byte[]
 	 * @value str String
 	 * @value from int
-	 * @return 杩斿洖
+	 * @return
 	 * @throws java.io.UnsupportedEncodingException
 	 */
 	public static int string2Bytes_BE(byte[] bs, String str, int from)throws Exception {
@@ -846,7 +846,7 @@
 	 * @value bs byte[]
 	 * @value str String
 	 * @value from int
-	 * @return 杩斿洖
+	 * @return
 	 * @throws java.io.UnsupportedEncodingException
 	 */
 	public static int string2Bytes_LE(byte[] bs, String str, int from)throws Exception {
@@ -898,10 +898,10 @@
 
 	/**
 	 * 鍒ゆ柇鏁扮粍涓嬫爣鏄惁瓒婄晫
-	 *
+	 * 
 	 * @value bsLength 鏁扮粍鎬婚暱搴�
 	 * @value toSite 鏁扮粍鍋忕Щ閲�
-	 * @return 杩斿洖
+	 * @return
 	 */
 	private static boolean isOutOfArrLength(int bsLength, int toSite) {
 		if (bsLength > toSite) {
@@ -911,104 +911,104 @@
 		}
 	}
 
-
+	
 	/**
-	 * 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓�
-	 *
-	 * @param src byte[]
+	 * 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓� 
+	 * 
+	 * @param b byte[]
 	 * @param hasBlank 16杩涘埗鏄惁鐢ㄧ┖鏍煎垎闅�
-	 * @return 杩斿洖 String
+	 * @return String
 	 */
-	public static String bytes2Hex(byte[] src, boolean hasBlank){
-	    StringBuilder stringBuilder = new StringBuilder("");
-	    if (src == null || src.length <= 0) {
-	        return null;
-	    }
-	    for (int i = 0; i < src.length; i++) {
-	        int v = src[i] & 0xFF;
-	        String str = Integer.toHexString(v);
-	        if (str.length() < 2) {
+	public static String bytes2Hex(byte[] src, boolean hasBlank){  
+	    StringBuilder stringBuilder = new StringBuilder("");  
+	    if (src == null || src.length <= 0) {  
+	        return null;  
+	    }  
+	    for (int i = 0; i < src.length; i++) {  
+	        int v = src[i] & 0xFF;  
+	        String str = Integer.toHexString(v);  
+	        if (str.length() < 2) {  
 	        	str = "0" + str;
-	        }
+	        }  
 			if (hasBlank) {
 				if (i == 0) {
-					stringBuilder.append(str);
+					stringBuilder.append(str);  
 				} else {
-					stringBuilder.append(" " + str);
+					stringBuilder.append(" " + str);  
 				}
 			} else {
-				stringBuilder.append(str);
+				stringBuilder.append(str); 
 			}
-	    }
+	    }  
 	    return stringBuilder.toString().toUpperCase(Locale.US);
-	}
+	}  
 	/**
-	 * 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓�
-	 *
-	 * @param src byte[]
+	 * 瀛楄妭鏁扮粍杞崲鎴愬崄鍏繘鍒剁殑瀛楃涓� 
+	 * 
+	 * @param b byte[]
 	 * @param hasBlank 16杩涘埗鏄惁鐢ㄧ┖鏍煎垎闅�
-	 * @param from 寮�濮嬩綅
-	 * @param len 闀垮害
-	 * @return 杩斿洖 String
+	 * @param from  
+	 * @param len 
+	 * @return String
 	 */
-	public static String bytes2Hex(byte[] src, boolean hasBlank, int from, int len){
-	    if (src == null || src.length <= 0 || src.length < from + len) {
-	        return null;
-	    }
+	public static String bytes2Hex(byte[] src, boolean hasBlank, int from, int len){  
+	    if (src == null || src.length <= 0 || src.length < from + len) {  
+	        return null;  
+	    }  
 		byte[] bb = new byte[len];
 		for (int i = 0 ; i < len; i++) {
 			bb[i] = src[from + i];
 		}
 	    return bytes2Hex(bb, hasBlank) ;
-	}
-	/**
+	}  
+	/** 
 	 * 鍗佸叚杩涘埗杞瓧鑺傛暟缁�
-	 * @param hex the hex string
-	 * @return 杩斿洖 byte[]
-	 */
-	public static byte[] hex2Bytes(String hex) {
-	    if (hex == null || hex.equals("")) {
-	        return null;
-	    }
-	    hex = hex.toUpperCase(Locale.ENGLISH);
-	    int length = hex.length() / 2;
-	    char[] hexChars = hex.toCharArray();
-	    byte[] d = new byte[length];
-	    for (int i = 0; i < length; i++) {
-	        int pos = i * 2;
-	        d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
-	    }
-	    return d;
-	}
-	/**
+	 * @param hexString the hex string 
+	 * @return byte[] 
+	 */  
+	public static byte[] hex2Bytes(String hex) {  
+	    if (hex == null || hex.equals("")) {  
+	        return null;  
+	    }  
+	    hex = hex.toUpperCase(Locale.ENGLISH);  
+	    int length = hex.length() / 2;  
+	    char[] hexChars = hex.toCharArray();  
+	    byte[] d = new byte[length];  
+	    for (int i = 0; i < length; i++) {  
+	        int pos = i * 2;  
+	        d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));  
+	    }  
+	    return d;  
+	}  
+	/** 
 	 * 鍗佸叚杩涘埗杞瓧鑺傛暟缁�
-	 * @param hex the hex string
-	 * @return 杩斿洖 byte[]
-	 */
-	public static int hex2Bytes(String hex, byte[] bs, int fromIndex) {
-	    if (hex == null || hex.equals("")) {
-	        return fromIndex;
-	    }
-	    hex = hex.toUpperCase(Locale.ENGLISH);
-	    int length = hex.length() / 2;
-	    char[] hexChars = hex.toCharArray();
-	    byte[] d = new byte[length];
-	    for (int i = 0; i < length; i++) {
-	        int pos = i * 2;
-	        d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));
+	 * @param hexString the hex string 
+	 * @return byte[] 
+	 */  
+	public static int hex2Bytes(String hex, byte[] bs, int fromIndex) {  
+	    if (hex == null || hex.equals("")) {  
+	        return fromIndex;  
+	    }  
+	    hex = hex.toUpperCase(Locale.ENGLISH);  
+	    int length = hex.length() / 2;  
+	    char[] hexChars = hex.toCharArray();  
+	    byte[] d = new byte[length];  
+	    for (int i = 0; i < length; i++) {  
+	        int pos = i * 2;  
+	        d[i] = (byte) (charToByte(hexChars[pos]) << 4 | charToByte(hexChars[pos + 1]));  
 	    }
 	    for(int i = 0 ; i < d.length; i++){
 	    	bs[fromIndex++] = d[i] ;
 	    }
-	    return fromIndex ;
-	}
+	    return fromIndex ;  
+	} 
 
 	private static final char[] HEX_CHAR = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 	/**
 	 * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
 	 *
 	 * @param bytes 寰呰浆鎹yte[]
-	 * @return 杩斿洖 杞崲鍚庣殑瀛楃涓�
+	 * @return 杞崲鍚庣殑瀛楃涓�
 	 */
 	public static String bytesToHex(byte[] bytes) {
 		//涓�涓猙yte涓�8浣嶏紝鍙敤涓や釜鍗佸叚杩涘埗浣嶆爣璇�
@@ -1027,40 +1027,12 @@
 		}
 		return new String(buf);
 	}
-	/**
-	 * 灏哹yte[]杞崲涓�16杩涘埗瀛楃涓�
-	 *
-	 * @param bytes 寰呰浆鎹yte[]
-	 * @return 杩斿洖 杞崲鍚庣殑瀛楃涓�
-	 */
-	public static String bytesToHex(byte[] bytes, int startIndex, int endIndex) {
-		byte[] bs = new byte[endIndex - startIndex + 1] ;
-		byte j = 0 ;
-		for(int i = startIndex; i <= endIndex; i++){
-			bs[j++] = bytes[i] ;
-		}
-		//涓�涓猙yte涓�8浣嶏紝鍙敤涓や釜鍗佸叚杩涘埗浣嶆爣璇�
-		char[] buf = new char[bs.length * 2];
-		int a = 0;
-		int index = 0;
-		for (byte b : bs) { // 浣跨敤闄や笌鍙栦綑杩涜杞崲
-			if (b < 0) {
-				a = 256 + b;
-			} else {
-				a = b;
-			}
-
-			buf[index++] = HEX_CHAR[a / 16];
-			buf[index++] = HEX_CHAR[a % 16];
-		}
-		return new String(buf);
-	}
 
 	/**
 	 * 灏�16杩涘埗瀛楃涓茶浆鎹负byte[]
 	 *
 	 * @param str 寰呰浆鎹㈠瓧绗︿覆
-	 * @return 杩斿洖 杞崲鍚庣殑byte[]
+	 * @return 杞崲鍚庣殑byte[]
 	 */
 	public static byte[] hexToBytes(String str) {
 		if (str == null || "".equals(str.trim())) {
@@ -1079,18 +1051,18 @@
 	/**
 	 * Convert char to byte
 	 * @param c char
-	 * @return 杩斿洖 byte
+	 * @return byte
 	 */
 	private static byte charToByte(char c) {
 		return (byte) "0123456789ABCDEF".indexOf(c);
-	}
-
+	}	 
+	 
 
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 鏁村舰杞垚BCD缂栫爜
-	 * @param i
-	 * @return 杩斿洖
+	 * @param l
+	 * @return
 	 */
 	public static byte[] int2BCD_BE(int i)throws Exception {
 		String str = "" + i;
@@ -1107,8 +1079,8 @@
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * 鏁村舰杞垚BCD缂栫爜锛屽瓧鑺傞『搴忔槸鍊掔殑
-	 * @param i
-	 * @return 杩斿洖
+	 * @param l
+	 * @return
 	 */
 	public static byte[] int2BCD_LE(int i)throws Exception {
 		String str = "" + i;
@@ -1127,7 +1099,7 @@
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 闀挎暣褰㈣浆鎴怋CD缂栫爜
 	 * @param l
-	 * @return 杩斿洖
+	 * @return
 	 */
 	public static byte[] long2BCD_BE(long l)throws Exception {
 		String str = "" + l;
@@ -1146,7 +1118,7 @@
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * 闀挎暣褰㈣浆鎴怋CD缂栫爜锛屽瓧鑺傞『搴忔槸鍊掔殑
 	 * @param l
-	 * @return 杩斿洖
+	 * @return
 	 */
 	public static byte[] long2BCD_LE(long l) throws Exception {
 		String str = "" + l;
@@ -1165,30 +1137,30 @@
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 瀛楃涓插瀷鏁板瓧杞垚BCD缂栫爜
 	 * @param s
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static byte[] string2BCD_BE(String s) throws Exception {
-		byte[] b ;
+		byte[] b = null;
 		if (s.length() % 2 == 0) {
 			b = new byte[s.length() / 2];
 		} else {
 			b = new byte[(s.length() / 2) + 1];
 		}
-
+		
 		encodeBCD_BE(s, b, 0, b.length);
 
 		return b ;
 	}
-
+	
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 瀛楃涓茶浆鎹㈡垚byte鏁扮粍
 	 * @value bs byte[]
 	 * @value str String
 	 * @value fromIndex int
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父 寮傚父
+	 * @return
+	 * @throws java.io.Exception
 	 */
 	public static int string2BCD_BE(byte[] bs, String str, int fromIndex)throws Exception {
 		byte[] bb = string2BCD_BE(str);
@@ -1207,8 +1179,8 @@
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * 瀛楃涓插瀷鏁板瓧杞垚BCD缂栫爜锛屽瓧鑺傞『搴忔槸鍊掔殑
 	 * @param s
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static byte[] string2BCD_LE(String s) throws Exception {
 		byte[] b = null;
@@ -1221,15 +1193,15 @@
 
 		return b;
 	}
-
+	
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * 瀛楃涓茶浆鎹㈡垚byte鏁扮粍
 	 * @value bs byte[]
 	 * @value str String
 	 * @value fromIndex int
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父 寮傚父
+	 * @return
+	 * @throws java.io.Exception
 	 */
 	public static int string2BCD_LE(byte[] bs, String str, int fromIndex)throws Exception {
 		byte[] bb = string2BCD_LE(str);
@@ -1249,8 +1221,10 @@
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
 	 * BCD缂栫爜杞垚鏁村瀷
 	 * @param b
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @param startIndex
+	 * @param endIndex
+	 * @return
+	 * @throws Exception
 	 */
 	public static int BCD2Int_BE(byte b) throws Exception {
 		String str = "";
@@ -1263,8 +1237,10 @@
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
 	 * BCD缂栫爜杞垚鏁村瀷锛屽瓧鑺傞『搴忔槸鍊掔殑
 	 * @param b
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @param startIndex
+	 * @param endIndex
+	 * @return
+	 * @throws Exception
 	 */
 	public static int BCD2Int_LE(byte b) throws Exception {
 		String str = "";
@@ -1279,8 +1255,8 @@
 	 * @param b
 	 * @param startIndex
 	 * @param endIndex
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static int BCD2Int_BE(byte[] b, int startIndex, int endIndex)throws Exception {
 		String str = "";
@@ -1295,8 +1271,8 @@
 	 * @param b
 	 * @param startIndex
 	 * @param endIndex
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static int BCD2Int_LE(byte[] b, int startIndex, int endIndex)throws Exception {
 		String str = "";
@@ -1311,8 +1287,8 @@
 	 * @param b
 	 * @param startIndex
 	 * @param endIndex
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static long BCD2Long_BE(byte[] b, int startIndex, int endIndex)throws Exception {
 		String str = "";
@@ -1328,8 +1304,8 @@
 	 * @param b
 	 * @param startIndex
 	 * @param endIndex
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static long BCD2Long_LE(byte[] b, int startIndex, int endIndex)throws Exception {
 		String str = "";
@@ -1344,8 +1320,8 @@
 	 * @param b
 	 * @param startIndex
 	 * @param endIndex
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static String BCD2String_BE(byte[] b, int startIndex, int endIndex) throws Exception {
 		return decodeBCD_BE(b, startIndex, endIndex - startIndex + 1);
@@ -1357,8 +1333,8 @@
 	 * @param b
 	 * @param startIndex
 	 * @param endIndex
-	 * @return 杩斿洖
-	 * @throws Exception 寮傚父
+	 * @return
+	 * @throws Exception
 	 */
 	public static String BCD2String_LE(byte[] b, int startIndex, int endIndex) throws Exception {
 		return decodeBCD_LE(b, startIndex, endIndex - startIndex + 1);
@@ -1366,17 +1342,17 @@
 
 	/**
 	 * 澶х妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍楂樺瓧鑺傘��
-	 * 缂栫爜BCD锛屼緥濡�1387缂栫爜鎴�  13  87锛岄『搴忔槸姝g殑
+	 * 缂栫爜BCD锛屼緥濡�1387缂栫爜鎴�  13  87锛岄『搴忔槸姝g殑 
 	 * @param value
 	 * @param dest
 	 * @param startIndex
-	 * @param length 闀垮害
+	 * @param length
 	 */
 	private static void encodeBCD_BE(String value, byte[] dest, int startIndex, int length)throws Exception {
 		if (value == null || !value.matches("\\d*")) {
 			throw new Exception("鏁板瓧杞垚BCD缂栫爜鏃跺嚭閿欙紝涓嶆槸鍚堟硶鏁板瓧:" + value, null);
 		}
-
+		
 		int[] tmpInts = new int[2 * length];
 		int index = value.length() - 1;
 		for (int i = tmpInts.length - 1; i >= 0 && index >= 0; i--, index--) {
@@ -1386,20 +1362,20 @@
 			dest[i] = (byte) (tmpInts[2 * j] * 16 + tmpInts[2 * j + 1]);
 		}
 	}
-
+	
 	/**
 	 * 灏忕妯″紡銆婃暟鎹綆浣嶅湪鏁扮粍浣庡瓧鑺傘��
-	 * 缂栫爜BCD锛屼緥濡�1387缂栫爜鎴�  87  13锛岄『搴忔槸鍊掔殑
+	 * 缂栫爜BCD锛屼緥濡�1387缂栫爜鎴�  87  13锛岄『搴忔槸鍊掔殑 
 	 * @param value
 	 * @param dest
 	 * @param startIndex
-	 * @param length 闀垮害
+	 * @param length
 	 */
 	private static void encodeBCD_LE(String value, byte[] dest, int startIndex, int length)throws Exception {
 		if (value == null || !value.matches("\\d*")) {
 			throw new Exception("鏁板瓧杞垚BCD缂栫爜鏃跺嚭閿欙紝涓嶆槸鍚堟硶鏁板瓧:" + value, null);
 		}
-
+		
 		int[] tmpInts = new int[2 * length];
 		int index = value.length() - 1;
 		for (int i = 0; i <= tmpInts.length - 1 && index >= 0; i++, index--) {
@@ -1417,8 +1393,8 @@
 	 * 瑙g爜BCD锛岄『搴忔槸姝g殑
 	 * @param src
 	 * @param startIndex
-	 * @param length 闀垮害
-	 * @return 杩斿洖
+	 * @param length
+	 * @return
 	 */
 	private static String decodeBCD_BE(byte[] src, int startIndex, int length)throws Exception {
 		StringBuilder sb = new StringBuilder();
@@ -1439,8 +1415,8 @@
  	 * 缂栫爜BCD锛岄『搴忔槸鍊掔殑
 	 * @param src
 	 * @param startIndex
-	 * @param length 闀垮害
-	 * @return 杩斿洖
+	 * @param length
+	 * @return
 	 */
 	private static String decodeBCD_LE(byte[] src, int startIndex, int length)throws Exception {
 		StringBuilder sb = new StringBuilder();
@@ -1486,7 +1462,6 @@
 //		System.out.println(v5);
 //
 //	}
-	/*
 	public static void main(String[] args) throws Exception {
 		byte[] bs = new byte[]{0x38, 0x36, 0x39, 0x31} ; 
 		String s = bytes2String_BE(bs, 0, 3) ;
@@ -1500,6 +1475,5 @@
 		}
 		System.out.println(v);
 	}
-	*/
 	
 }

--
Gitblit v1.8.0