From cb7ca191bf7dfe5db4dc30f1576f8c5362761154 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 16 五月 2024 18:38:02 +0800 Subject: [PATCH] 修改bug,协议中报警及状态是4个字节,程序实现中当2个字节 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java index 4f5c820..be815e8 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java @@ -92,23 +92,23 @@ cdData.projectNo = (int)bs[index]; index++ ; - int lng = ByteUtil.BCD2Int_BE(bs, index, index + 4) ; + Long lng = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; cdData.lng = lng/1000000.0D; index += 5 ; - int lat = ByteUtil.BCD2Int_BE(bs, index, index + 4) ; + Long lat = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; cdData.lat = lat/1000000.0D; index += 5 ; - int softVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ; + int softVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; cdData.softVersion = softVersion/10.0F; index += 2 ; - int hardVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ; + int hardVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; cdData.hardVersion = hardVersion/10.0F; index += 2 ; - int protocolVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ; + int protocolVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; cdData.protocolVersion = protocolVersion/10.0F; } -- Gitblit v1.8.0