From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 25 二月 2025 14:33:15 +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/p206V202404/parse/Cd_8A_Up.java | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 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 d45f4f2..141284c 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 @@ -96,24 +96,24 @@ cdData.projectNo = (int)bs[index]; index++ ; - Long lng = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; + Long lng = ByteUtil.BCD2Long_BE(bs, index, index + 4) ; cdData.lng = lng/1000000.0D; index += 5 ; - Long lat = ByteUtil.BCD2Long_LE(bs, index, index + 4) ; + Long lat = ByteUtil.BCD2Long_BE(bs, index, index + 4) ; cdData.lat = lat/1000000.0D; index += 5 ; - int softVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; - cdData.softVersion = softVersion/10.0F; + int softVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ; + cdData.softVersion = softVersion/100.0F; index += 2 ; - int hardVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; - cdData.hardVersion = hardVersion/10.0F; + int hardVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ; + cdData.hardVersion = hardVersion/100.0F; index += 2 ; - int protocolVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ; - cdData.protocolVersion = protocolVersion/10.0F; + int protocolVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ; + cdData.protocolVersion = protocolVersion/100.0F; } } -- Gitblit v1.8.0