From f5a10d5ae1290d8ceefee143815555d59be6ff9a Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 23 五月 2024 08:50:58 +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 | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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..deaeeed 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 @@ -83,7 +83,7 @@ */ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { DataV202404 dV1 = (DataV202404)data.getSubData() ; - DataCd8AVo cdData = new DataCd8AVo() ; + DataCd8AVo cdData = new DataCd8AVo(CodeV202404.getCodeName(dataCode)) ; dV1.subData = cdData ; int index = ProtocolConstantV206V202404.dataIndex ; cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ; @@ -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