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/tcp/ClientHandler.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ard/utils/tcp/ClientHandler.java b/src/main/java/com/ard/utils/tcp/ClientHandler.java
index 15258ce..0063611 100644
--- a/src/main/java/com/ard/utils/tcp/ClientHandler.java
+++ b/src/main/java/com/ard/utils/tcp/ClientHandler.java
@@ -175,7 +175,7 @@
if (!crc32Check) {
log.debug("CRC32鏍￠獙涓嶉�氳繃");
} else {
- log.debug("CRC32鏍￠獙閫氳繃");
+ //log.debug("CRC32鏍￠獙閫氳繃");
}
//endregion
//log.info("鍘熷鏁版嵁:" + DatatypeConverter.printHexBinary(data));
@@ -188,6 +188,7 @@
// log.info("鍛戒护ID:" + DatatypeConverter.printHexBinary(cmdId));
byte[] payloadSize = Arrays.copyOfRange(data, 2, 4);//鏈夋晥璐熻浇澶у皬
payloadSize = ByteUtils.toLittleEndian(payloadSize);
+ //log.info("payloadSize:" + DatatypeConverter.printHexBinary(payloadSize));
int payloadSizeToDecimal = ByteUtils.bytesToDecimal(payloadSize);
// log.info("鏈夋晥璐熻浇澶у皬(杞暣鍨�):" + payloadSizeToDecimal);
//endregion
@@ -461,13 +462,17 @@
log.debug("鏂逛綅:" + tx);
byte[] fTy = Arrays.copyOfRange(data, 12, 16);
fTy = ByteUtils.toLittleEndian(fTy);
- float ty= ByteUtils.bytesToFloat(fTy);
+ float ty = ByteUtils.bytesToFloat(fTy);
+ if (ty < 0) {
+ ty += 360;
+ }
log.debug("淇话:" + ty);
- Map<String,Object>forceGuideMap=new HashMap<>();
- forceGuideMap.put("p",tx);
- forceGuideMap.put("t",ty);
- forceGuideMap.put("z",1);
- forceGuideMap.put("radarId",radarId);
+ Map<String, Object> forceGuideMap = new HashMap<>();
+ forceGuideMap.put("distance", distance);
+ forceGuideMap.put("p", tx);
+ forceGuideMap.put("t", ty);
+ forceGuideMap.put("radarId", radarId);
+ log.debug("寮哄埗寮曞淇℃伅" + forceGuideMap);
//endregion
MqttProducer.publish(2, false, "radarForceGuide", JSON.toJSONString(forceGuideMap));
}
@@ -475,5 +480,4 @@
log.error("闆疯揪鎶ユ枃瑙ｆ瀽寮傚父:" + ex.getMessage());
}
}
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3