From 356235e230dd0f8c01f2690f5818cb6a9abcc481 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 02 十二月 2024 15:31:17 +0800
Subject: [PATCH] 修改升级协议中的bug，帧长度由大端模式改为小端模式
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
index c4a784d..f33e72c 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/global/GlCreate.java
@@ -54,12 +54,13 @@
public static void createLen4PUg(byte[] bytes) throws Exception {
int len = bytes.length - 4;
- byte[] bs = ByteUtil.int2BCD_LE(len) ;
+ byte[] bs = ByteUtil.short2Bytes_LE((short)len) ;
if(bs != null && bs.length == 1){
- bytes[1] = bs[0] ;
+ bytes[1] = 0 ;
+ bytes[2] = bs[0] ;
}else if(bs != null && bs.length > 1){
- bytes[1] = bs[0] ;
- bytes[2] = bs[1] ;
+ bytes[1] = bs[1] ;
+ bytes[2] = bs[0] ;
}
}
@@ -92,9 +93,9 @@
}
public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception {
- int crc = new CRC16().CRC(bsNoTail, 0, bsNoTail.length -1) ;
+ short crc = new CRC16().CRC16_table(bsNoTail, 0, bsNoTail.length -1) ;
byte[] bytes = new byte[ProtocolConstantV206V1.UG_lenTail] ;
- ByteUtilUnsigned.short2Bytes_BE(bytes, crc, 0);
+ ByteUtil.short2Bytes_LE(bytes, crc, 0);
bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ;
return bytes ;
}
--
Gitblit v1.8.0