From 235d23f498e46e3415bf12a81b2056b792ea1808 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 09 五月 2025 14:52:41 +0800
Subject: [PATCH] 朝阳仓储BUG修改 1.传递中文字符 2.仓储车接口调整
---
nglib/src/ng/devices/HexUtil.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/nglib/src/ng/devices/HexUtil.java b/nglib/src/ng/devices/HexUtil.java
index cf21d94..c2a8f1f 100644
--- a/nglib/src/ng/devices/HexUtil.java
+++ b/nglib/src/ng/devices/HexUtil.java
@@ -22,7 +22,7 @@
return result;
}
- //姝ｅ父鐨勫瓧姣嶆暟瀛楀彉鎴愬瓧鑺傛暟鍙戦?佺粰鐩掑瓙
+ //姝ｅ父鐨勫瓧姣嶆暟瀛楀彉鎴愬瓧鑺傛暟鍙戯拷?锟界粰鐩掑瓙
public static String asciiToHex(String str) {
char[] chars = str.toCharArray();
@@ -45,11 +45,11 @@
return result.toString();
}//12300 //00321
- //浜岃繘鍒惰浆鍗佽繘鍒?
+ //浜岃繘鍒惰浆鍗佽繘锟�?
public static int int2ToHex(String number) {
return Integer.parseInt(number, 2);
}
- //浜岃繘鍒惰浆16杩涘埗 4浣?
+ //浜岃繘鍒惰浆16杩涘埗 4锟�?
public static String intBinaryTo16(String number) {
int num=int2ToHex(number);
return intTo2ByteHex(num);
@@ -58,7 +58,7 @@
public static int int16ToHex(String number) {
return Integer.parseInt(number, 16);
}
- //鍗佽繘鍒惰浆浜岃繘鍒?
+ //鍗佽繘鍒惰浆浜岃繘锟�?
public static String intToBinary(int number) {
return Integer.toBinaryString(number);
}
@@ -82,7 +82,7 @@
}
/**
- * 灏嗘暣鏁拌浆鎹负2浣?16杩涘埗锛屽1杞崲涓?01锛?10杞崲涓?0a
+ * 灏嗘暣鏁拌浆鎹负2锟�?16杩涘埗锛屽1杞崲锟�?01锟�?10杞崲锟�?0a
*
* @param number
* @return
@@ -96,7 +96,7 @@
}
/**
- * 灏嗘暣鏁拌浆鎹负4浣?16杩涘埗锛屽1杞崲涓?0001锛?10杞崲涓?000a
+ * 灏嗘暣鏁拌浆鎹负4锟�?16杩涘埗锛屽1杞崲锟�?0001锟�?10杞崲锟�?000a
*
* @param number
* @return
@@ -108,9 +108,9 @@
return numberHex;
}
-
+
/**
- * 灏嗘暣鏁拌浆鎹负8浣?16杩涘埗锛屽1杞崲涓?00000001锛?10杞崲涓?0000000a
+ * 灏嗘暣鏁拌浆鎹负8锟�?16杩涘埗锛屽1杞崲锟�?00000001锟�?10杞崲锟�?0000000a
*
* @param number
* @return
@@ -122,7 +122,7 @@
}
/**
- * 灏嗘椂闂磋浆鎹负16杩涘埗鏍煎紡锛屽勾锛?2瀛楄妭锛? + 鏈堬紙1瀛楄妭锛? + 鏃ワ紙1瀛楄妭锛? + 鏃讹紙1瀛楄妭锛? + 鍒嗭紙1瀛楄妭锛? + 绉掞紙1瀛楄妭锛?
+ * 灏嗘椂闂磋浆鎹负16杩涘埗鏍煎紡锛屽勾锟�?2瀛楄妭锟�? + 鏈堬紙1瀛楄妭锟�? + 鏃ワ紙1瀛楄妭锟�? + 鏃讹紙1瀛楄妭锟�? + 鍒嗭紙1瀛楄妭锟�? + 绉掞紙1瀛楄妭锟�?
*
* @param time
* @return
@@ -142,7 +142,7 @@
}
/**
- * 灏?16杩涘埗鐨勬椂闂磋浆鎹负yyyy-MM-dd HH:mm:ss鐨勬牸寮?
+ * 锟�?16杩涘埗鐨勬椂闂磋浆鎹负yyyy-MM-dd HH:mm:ss鐨勬牸锟�?
*
* @param hexTime
* @return
@@ -157,7 +157,7 @@
return year + "-" + month + "-" + day + " " + hour + ":" + minute + ":" + second;
}
- //鍗佸叚杩涘埗杞?10杩涘埗
+ //鍗佸叚杩涘埗锟�?10杩涘埗
public static int hexToInt(String hex) {
return Integer.parseInt(hex, 16);
}
@@ -181,7 +181,7 @@
}
/**
- * 灏嗗瓧鑺傝浆鎹负涓や綅鍗佸叚杩涘埗瀛楃涓诧紝涓嶅浣嶅墠鍔?0
+ * 灏嗗瓧鑺傝浆鎹负涓や綅鍗佸叚杩涘埗瀛楃涓诧紝涓嶅浣嶅墠锟�?0
*
* @param b
* @return
@@ -197,7 +197,7 @@
}
/**
- * 灏嗗崄鍏繘鍒跺瓧绗︼紝杞崲鎴愪簩杩涘埗鐨勫瓧绗?
+ * 灏嗗崄鍏繘鍒跺瓧绗︼紝杞崲鎴愪簩杩涘埗鐨勫瓧锟�?
*
* @param b
* @return
@@ -213,7 +213,7 @@
}
/**
- * 灏嗗崄鍏繘鍒跺瓧绗︼紝杞崲鎴愪簩杩涘埗鐨勫瓧绗?
+ * 灏嗗崄鍏繘鍒跺瓧绗︼紝杞崲鎴愪簩杩涘埗鐨勫瓧锟�?
*
* @param b
* @return
@@ -231,7 +231,7 @@
/**
- * 鍗佽繘鍒跺瓧鑺傛暟缁勮浆鍗佸叚杩涘埗瀛楃涓?
+ * 鍗佽繘鍒跺瓧鑺傛暟缁勮浆鍗佸叚杩涘埗瀛楃锟�?
* @param bufSize
* @param msg
* @return
@@ -270,16 +270,18 @@
// System.out.println(HexUtil.hexToInt("00d2"));
//
// System.out.println(HexUtil.formatHex("3c5354413e"));
+
+
String message = "Hello World!|This is the first signal from device!";
- int length = message.length() * 2 + 10; // 闀垮害鍖呮嫭缁撳熬鐨?<EOF>锛屼竴涓瓧绗﹀湪淇″彿涓敱涓や釜瀛楄妭琛ㄧず銆?
+ int length = message.length() * 2 + 10; // 闀垮害鍖呮嫭缁撳熬锟�?<EOF>锛屼竴涓瓧绗﹀湪淇″彿涓敱涓や釜瀛楄妭琛ㄧず锟�?
- String command = HexUtil.asciiToHex("<STA>"); // 娣诲姞寮?濮嬫爣璇?
+ String command = HexUtil.asciiToHex("<STA>"); // 娣诲姞锟�?濮嬫爣锟�?
command += (String.format("%4s", HexUtil.intToHex(length)).replace(' ', '0')); // 娣诲姞闀垮害鏍囪瘑
- command += "01"; // 娣诲姞璁惧绫诲瀷 0x01琛ㄧず鍒囧壊鏈猴紝0x02琛ㄧず閽㈠寲鐐?
- command += "0001"; // 娣诲姞璁惧鍨嬪彿锛?0x0001琛ㄧず鍩烘湰娆撅紝0x0002琛ㄧず涓骇娆?
+ command += "01"; // 娣诲姞璁惧绫诲瀷 0x01琛ㄧず鍒囧壊鏈猴紝0x02琛ㄧず閽㈠寲锟�?
+ command += "0001"; // 娣诲姞璁惧鍨嬪彿锟�?0x0001琛ㄧず鍩烘湰娆撅紝0x0002琛ㄧず涓骇锟�?
command += "0000"; // 鍔熻兘鍙凤紝0x0000鏄笅浣嶆満涓诲姩鍙戠粰涓婁綅鏈猴紱0x0001鏄笂浣嶆満淇敼涓嬩綅鏈篟TC
- command += "00"; // 鍔犲瘑鏂瑰紡锛?0x00琛ㄧず涓嶅姞瀵?
+ command += "00"; // 鍔犲瘑鏂瑰紡锟�?0x00琛ㄧず涓嶅姞锟�?
Calendar c = Calendar.getInstance();
--
Gitblit v1.8.0