From 44180ee779c038ad628fcd847a0b8e2ca9b6f4ee Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期五, 22 十一月 2024 10:46:17 +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_83_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_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java index 6d2b8c7..22394bd 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java @@ -24,7 +24,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, @@ -86,7 +86,7 @@ callback.notify(new ValveStateInfo(false)); } } - return new MidResult[]{midRs, confirmCommand} ; + return new MidResult[]{confirmCommand, midRs} ; } /** * 鎵ц鍒嗘瀽 @@ -222,7 +222,7 @@ Data data = new Data() ; data.setSubData(new DataV2()) ; - int bsLen = new CommonV2().parseDataLen(bs) ; + int bsLen = new CommonV2().parseDataLen4P206(bs) ; if(bsLen > 0){ try { obj.doParse(bs, -- Gitblit v1.8.0