feat: 修复TCP命令下发BUG

@@ -745,10 +745,4 @@ public class TcpTransportHandler extends ChannelInboundHandlerAdapter implements
         ChannelHandlerContext ctx = deviceSessionCtx.getChannel();
         ctx.close();
     }
-
-    public static void main(String[] args){
-        System.out.printf("结果1：" + ByteUtils.stringEncodeToHex("hex转字符串"));
-    System.out.printf("结果2：" + ByteUtils.hexDecodeToString("686578e8bdace5ad97e7aca6e4b8b2"));
-    System.out.printf("匹配结果：" + "414244535344".matches("-?[0-9a-fA-F]+"));
-    }
 }

@@ -43,6 +43,8 @@ public class ByteUtils {
             '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
 
     public static final String UTF_8 = "UTF-8";
+
+    private static String hexString="0123456789ABCDEF";
     /**
      * 将short整型数值转换为字节数组
      *
@@ -785,4 +787,64 @@ public class ByteUtils {
         int highByte = (src & 0x00FF) << 8;
         return lowByte | highByte;
     }
+
+  /**
+   * 将字符串编码成16进制数字,适用于所有字符(包括中文)
+   * @param str 字符串
+   * @return
+   */
+  public static String stringEncodeToHex(String str) {
+        //根据默认编码获取字节数组
+        byte[] bytes=str.getBytes();
+        StringBuilder sb=new StringBuilder(bytes.length*2);
+        //将字节数组中每个字节拆解成2位16进制整数
+        for(int i=0;i<bytes.length;i++)
+        {
+            sb.append(hexString.charAt((bytes[i]&0xf0)>>4));
+            sb.append(hexString.charAt((bytes[i]&0x0f)>>0));
+        }
+        return sb.toString();
+
+    }
+
+  /**
+   * 将16进制数字解码成字符串,适用于所有字符(包括中文)
+   * @param hex 16进制
+   * @return
+   */
+  public static String hexDecodeToString(String hex) {
+        try{
+            byte[] baKeyword = new byte[hex.length()/2];
+            for(int i = 0; i < baKeyword.length; i++) {
+                baKeyword[i] = (byte)(0xff & Integer.parseInt(hex.substring(i*2, i*2+2),16));
+            }
+            return new String(baKeyword,"UTF-8");
+        }catch (UnsupportedEncodingException e){
+            return null;
+        }
+    }
+
+    public static byte[] hexToByteArray(String inHex){
+        inHex.replace(" ","");
+        int hexlen = inHex.length();
+        byte[] result;
+        if (hexlen % 2 == 1){
+            //奇数
+            hexlen++;
+            result = new byte[(hexlen/2)];
+            inHex="0"+inHex;
+        }else {
+            //偶数
+            result = new byte[(hexlen/2)];
+        }
+        int j=0;
+        for (int i = 0; i < hexlen; i+=2){
+            result[j]=hexToByte(inHex.substring(i,i+2));
+            j++;
+        }
+        return result;
+    }
+    public static byte hexToByte(String inHex){
+        return (byte)Integer.parseInt(inHex,16);
+    }
 }