From 4f99f59668c9160ca60958b7347944def26f2228 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 四月 2025 10:58:53 +0800
Subject: [PATCH] 回退配置
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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..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
@@ -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