From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 25 二月 2025 14:33:15 +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_A0_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_A0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_A0_Up.java index d13bb4c..39923f1 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_A0_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_A0_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){ - DataCdA0Vo subData = (DataCdA0Vo)para.data.getSubData() ; + DataCdA0Vo subData = (DataCdA0Vo)((DataV2)para.data.getSubData()).subData ; callback.notify(new ValveStateInfo(subData.success)); } return new MidResult[]{midRs} ; -- Gitblit v1.8.0