From eaca4ca8681eb9c3486f1ddebe99756d5ab36505 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 七月 2025 14:09:17 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 2b187ae..ba3d091 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
@@ -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} ;
}
/**
@@ -86,9 +86,9 @@
* @throws Exception 寮傚父
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
- DataV202404 dV1 = (DataV202404)data.getSubData() ;
+ DataV202404 dV202404 = (DataV202404)data.getSubData() ;
DataCd8AVo cdData = new DataCd8AVo(CodeV202404.getCodeName(dataCode)) ;
- dV1.subData = cdData ;
+ dV202404.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -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