From bf1b78168478f802a7413d438b16ab64b27b7f4a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 02 四月 2025 14:32:38 +0800
Subject: [PATCH] 代码优化
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 a96b095..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
@@ -22,7 +22,7 @@
@Override
public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
ParseParamsForUpV202404 para = (ParseParamsForUpV202404)params ;
- int bsLen = new CommonV202404().parseDataLen(para.upBuffer) ;
+ int bsLen = new CommonV202404().parseDataLen4P202404(para.upBuffer) ;
if(bsLen > 0){
this.doParse(para.upBuffer,
bsLen,
@@ -74,7 +74,7 @@
//浣庡姛鑰楁椂锛屽敖蹇彂閫�
confirmCommand.isQuickSend = true ;
}
- callback.callback(midRs.reportOrResponse_trueOrFalse);
+ callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);
return new MidResult[]{confirmCommand, midRs} ;
}
/**
@@ -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