From 3ef98ab448649d1d6b601aed2535605c66c93e49 Mon Sep 17 00:00:00 2001 From: zhugongping Date: Sat, 19 Sep 2026 04:40:48 +0800 Subject: [PATCH] fix --- .../java/com/fastbee/common/utils/gateway/CRC8Utils.java | 6 +++--- .../fastbee/common/utils/gateway/protocol/ByteUtils.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/CRC8Utils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/CRC8Utils.java index 48a26cc5..35e98b4c 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/CRC8Utils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/CRC8Utils.java @@ -25,12 +25,12 @@ public class CRC8Utils { */ public static byte calcCrc8_E5(byte[] data) { byte crc = 0; - for (int j = 0; j < data.length; j++) { - crc ^= data[j]; + for (byte datum : data) { + crc ^= datum; for (int i = 0; i < 8; i++) { if ((crc & 0x80) != 0) { crc = (byte) ((crc) << 1); - crc ^= 0xE5; + crc ^= (byte) 0xE5; } else { crc = (byte) ((crc) << 1); } diff --git a/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/protocol/ByteUtils.java b/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/protocol/ByteUtils.java index c6ce73e0..1ac13ad5 100644 --- a/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/protocol/ByteUtils.java +++ b/fastbee-common/src/main/java/com/fastbee/common/utils/gateway/protocol/ByteUtils.java @@ -78,8 +78,7 @@ public class ByteUtils { byte[] write = new byte[length]; int index = 0; - for (int i = 0; i < bytes.size(); i++) { - byte[] values = bytes.get(i); + for (byte[] values : bytes) { addBytes(write, values, index); index += values.length; } @@ -312,8 +311,9 @@ public class ByteUtils { if (StringUtils.isBlank(hexStr)) { return null; } - if (hexStr.length() % 2 != 0) {//长度为单数 - hexStr = "0" + hexStr;//前面补0 + // 长度为单数 + if (hexStr.length() % 2 != 0) { + hexStr = "0" + hexStr; // 前面补0 } char[] chars = hexStr.toCharArray();