From 03b0fb0ba2de86bcfff277778826547c0e37a93f Mon Sep 17 00:00:00 2001
From: 张世豪 <979909237@qq.com>
Date: 星期四, 20 十一月 2025 23:52:51 +0800
Subject: [PATCH] 优化修改
---
src/publicway/SerialProtocolParser.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/publicway/SerialProtocolParser.java b/src/publicway/SerialProtocolParser.java
index c80bf15..f342178 100644
--- a/src/publicway/SerialProtocolParser.java
+++ b/src/publicway/SerialProtocolParser.java
@@ -5,6 +5,7 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+import chuankou.SerialPortService;
import publicway.ProtocolParser01.ParseResult;
public class SerialProtocolParser {
@@ -45,7 +46,7 @@
*/
public void start() {
if (isRunning) {
- System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡缁忓湪杩愯涓�");
+ //System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡缁忓湪杩愯涓�");
return;
}
@@ -58,7 +59,7 @@
processorThread.setDaemon(true);
processorThread.start();
- System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍚姩");
+ //System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍚姩");
}
/**
@@ -97,7 +98,7 @@
batchQueue.clear();
bufferPosition = 0;
- System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍋滄");
+ //System.out.println("涓插彛鍗忚瑙ｆ瀽鍣ㄥ凡鍋滄");
}
/**
@@ -112,7 +113,7 @@
*/
public void receiveData(byte[] rawData) {
if (!isRunning) {
- System.out.println("璀﹀憡: 涓插彛鍗忚瑙ｆ瀽鍣ㄦ湭鍚姩锛屽拷鐣ユ帴鏀剁殑鏁版嵁");
+ //System.out.println("璀﹀憡: 涓插彛鍗忚瑙ｆ瀽鍣ㄦ湭鍚姩锛屽拷鐣ユ帴鏀剁殑鏁版嵁");
return;
}
@@ -166,7 +167,7 @@
long maxMem = runtime.maxMemory();
if (usedMem > maxMem * 0.8) {
- System.out.println("鍐呭瓨浣跨敤鐜囪秴杩�80%锛屽綋鍓嶄娇鐢�: " + (usedMem / 1024 / 1024) + "MB");
+ //System.out.println("鍐呭瓨浣跨敤鐜囪秴杩�80%锛屽綋鍓嶄娇鐢�: " + (usedMem / 1024 / 1024) + "MB");
}
}
@@ -249,14 +250,14 @@
* 澶勭悊鏁版嵁鍖呯殑涓绘柟娉�
*/
private void processPackets() {
- System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬪紑濮嬭繍琛�");
+ //System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬪紑濮嬭繍琛�");
while (isRunning && !Thread.currentThread().isInterrupted()) {
try {
byte[] packet = dataQueue.take(); // 闃诲鐩村埌鏈夋暟鎹�
parsePacket(packet);
} catch (InterruptedException e) {
- System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬭涓柇");
+ //System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬭涓柇");
Thread.currentThread().interrupt();
break;
} catch (Exception e) {
@@ -265,7 +266,7 @@
}
}
- System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬬粨鏉熻繍琛�");
+ //System.out.println("涓插彛鏁版嵁鍖呭鐞嗙嚎绋嬬粨鏉熻繍琛�");
}
/**
@@ -273,6 +274,7 @@
*/
private void parsePacket(byte[] packet) {
try {
+ SerialPortService.getReceivedDataCount();
// 瑙ｆ瀽鍩烘湰瀛楁
byte hostAddress = packet[4]; // 涓绘満鍦板潃
byte slotAddress = packet[5]; // 鍗℃Ы鍦板潃
@@ -296,7 +298,7 @@
// 浣跨敤浼樺寲鐨勫瓧鑺傛暟缁勮В鏋愭柟娉曪紝閬垮厤瀛楃涓茶浆鎹�
ParseResult rst = ProtocolParser01.parseDDCC01Data(packet);
rst.fuzhi();
- rst.toString();
+// rst.toString();
}
break;
case FUNCTION_51:
@@ -304,25 +306,25 @@
String hexPacket = bytesToHex(packet);
int result = ProtocolParser51.parse(hexPacket);
if (result == 1) {
- System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒舵垚鍔�");
+ //System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒舵垚鍔�");
} else {
- System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒跺け璐ユ垨鎶ユ枃涓嶅悎娉�");
+ //System.out.println("鍔熻兘鐮� 0x51 - 寮�闂ㄦ帶鍒跺け璐ユ垨鎶ユ枃涓嶅悎娉�");
}
break;
case FUNCTION_52:
- System.out.println("鍔熻兘鐮� 0x52 - LED浜害鎺у埗");
+ //System.out.println("鍔熻兘鐮� 0x52 - LED浜害鎺у埗");
break;
case FUNCTION_80:
- System.out.println("鍔熻兘鐮� 0x80 - 宸ュ崱鍗囩骇浣胯兘");
+ //System.out.println("鍔熻兘鐮� 0x80 - 宸ュ崱鍗囩骇浣胯兘");
break;
case FUNCTION_81:
- System.out.println("鍔熻兘鐮� 0x81 - 宸ヤ綔鍗″崌绾ф暟鎹寘");
+ //System.out.println("鍔熻兘鐮� 0x81 - 宸ヤ綔鍗″崌绾ф暟鎹寘");
break;
case FUNCTION_82:
- System.out.println("鍔熻兘鐮� 0x82 - 鍗曟澘鍗囩骇浣胯兘");
+ //System.out.println("鍔熻兘鐮� 0x82 - 鍗曟澘鍗囩骇浣胯兘");
break;
case FUNCTION_83:
- System.out.println("鍔熻兘鐮� 0x83 - 鍗曟澘鍗囩骇鏁版嵁鍖�");
+ //System.out.println("鍔熻兘鐮� 0x83 - 鍗曟澘鍗囩骇鏁版嵁鍖�");
break;
default:
System.err.println("鏈煡鍔熻兘鐮�: 0x" + Integer.toHexString(functionCode & 0xFF));
--
Gitblit v1.9.3