From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 15 五月 2024 16:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
index 5875d55..5b65103 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_65_Up.java
@@ -96,19 +96,19 @@
             cdData.icCardNo  = GlParse.parseIcCardNo(bs, index, 6, 2) ;
 
             index += 8 ;
-            int moneyRemain = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+            Long moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
             cdData.moneyRemain = moneyRemain/100.0D;
 
             index += 5 ;
-            int waterRemain = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+            Long waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
             cdData.waterRemain = waterRemain/100.0D;
 
             index += 5 ;
-            int thisEle = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+            int thisEle = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
             cdData.thisEle = thisEle/100.0D;
 
             index += 4 ;
-            int thisWater = ByteUtil.BCD2Int_BE(bs, index, index + 3) ;
+            int thisWater = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
             cdData.thisWater = thisWater/100.0D;
 
             index += 4 ;

--
Gitblit v1.8.0