From 1e6561acc89b7105c1dcbf5395845d6046f1453d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期五, 21 二月 2025 16:55:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_99_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/p206V2/parse/Cd_99_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_99_Up.java
index 81a53a0..88267e8 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_99_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_99_Up.java
@@ -27,7 +27,7 @@
     @Override
     public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception {
         ParseParamsForUpV2 para = (ParseParamsForUpV2)params ;
-        int bsLen = new CommonV2().parseDataLen(para.upBuffer) ;
+        int bsLen = new CommonV2().parseDataLen4P206(para.upBuffer) ;
         if(bsLen > 0){
             this.doParse(para.upBuffer,
                     bsLen,
@@ -47,9 +47,9 @@
 
         midRs.reportOrResponse_trueOrFalse = false ;//涓诲姩涓婃姤
 
-        callback.callback(midRs.reportOrResponse_trueOrFalse);
+        callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV2)(para.data.subData)).subData);
         if(para.data != null && para.data.getSubData() != null){
-            DataCd99Vo subData = (DataCd99Vo)para.data.getSubData() ;
+            DataCd99Vo subData = (DataCd99Vo)((DataV2)para.data.getSubData()).subData ;
             callback.notify(new ValveStateInfo(subData.success));
         }
         return new MidResult[]{midRs} ;

--
Gitblit v1.8.0