From b375247a32664d3d1a37d735180f25ca8f5aedf7 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 03 三月 2025 10:05:46 +0800
Subject: [PATCH] 灌溉模块功能升级

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

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java
index 53cae94..23c3078 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java
@@ -24,7 +24,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,
@@ -76,12 +76,12 @@
             //浣庡姛鑰楁椂锛屽敖蹇彂閫�
             confirmCommand.isQuickSend = true ;
         }
-        callback.callback(midRs.reportOrResponse_trueOrFalse);
+        callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData);
         if(para.data != null && ((DataV202404)para.data.getSubData()).subData != null){
             callback.notify(new ValveStateInfo(false));
         }
 
-        return new MidResult[]{midRs, confirmCommand} ;
+        return new MidResult[]{confirmCommand, midRs} ;
     }
     /**
      * 鎵ц鍒嗘瀽

--
Gitblit v1.8.0