From 5fcdef2e8eec55221bb65a7a2cf91a4be7cc89ac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 02 十二月 2024 16:41:11 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java index 71b7883..eb37b70 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/global/GlCreate.java @@ -1,5 +1,6 @@ package com.dy.common.mw.protocol.p206V2.parse.global; +import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1; import com.dy.common.mw.protocol.p206V2.ProtocolConstantV206V2; import com.dy.common.util.*; @@ -95,9 +96,12 @@ public static byte[] createCrcTail4Ug(byte[] bsNoTail) throws Exception { int crc = new CRC16().CRC16_table(bsNoTail, 0, bsNoTail.length -1) ; + byte[] crcBs = new byte[4] ; + ByteUtil.int2Bytes_BE(crcBs, crc, 0); byte[] bytes = new byte[ProtocolConstantV206V2.UG_lenTail] ; - ByteUtilUnsigned.short2Bytes_LE(bytes, crc, 0); - bytes[2] = ProtocolConstantV206V2.P_Tail_Byte ; + bytes[0] = crcBs[2] ; + bytes[1] = crcBs[3] ; + bytes[2] = ProtocolConstantV206V1.P_Tail_Byte ; return bytes ; } } -- Gitblit v1.8.0