From 4783fc799e4416c4c90e07afd00e733502f0bba8 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 31 十月 2024 16:09:11 +0800 Subject: [PATCH] 1、更新日漏损最新记录有bug(新生成了记录,应该是更新老记录),修改之 ; 2、CommonV1_0_0中获取开关阀类型名称时,对于null返回空字符串。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java | 38 +++++++++++++++++++++++++++----------- 1 files changed, 27 insertions(+), 11 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java index 047c0d7..1e8ba6b 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/CRC8_for_2_0.java @@ -4,18 +4,34 @@ public class CRC8_for_2_0 { @SuppressWarnings("unused") +// public int CRC8(byte[] b, int from , int end){ +// int crc = 0; +// for(int i = from ; i <= end ; i++){ +// crc = crc ^ (b[i]); +// for(int j = 0; j < 8; j++) { +// if((crc & 0x80)!=0) { +// crc ^= 0xe5; +// } +// crc *= 2; +// } +// } +// return crc; +// } + public int CRC8(byte[] b, int from , int end){ - int crc = 0; - for(int i = from ; i <= end ; i++){ - crc = crc ^ (b[i]); - for(int j = 0; j < 8; j++) { - if((crc & 0x80)!=0) { - crc ^= 0xe5; - } - crc *= 2; + int crc = 0; + for(int i = from ; i <= end ; i++){ + crc = crc ^ (b[i]); + for(int j = 0; j < 8; j++) { + if((crc & 0x80)!=0) { + crc *= 2; + crc ^= 0xe5; + }else{ + crc *= 2; + } } - } - return crc; - } + } + return crc; + } } \ No newline at end of file -- Gitblit v1.8.0