From e2c28bc98587c6edd6a38f06b972ff51d998028f Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期三, 27 十一月 2024 08:52:05 +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/p206V202404/parse/Cd_C2_Up.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java index 037cf9c..7558ba0 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_Up.java @@ -2,8 +2,6 @@ import com.dy.common.mw.protocol.*; -import com.dy.common.mw.protocol.p206V2.upVos.DataCd83CloseVo; -import com.dy.common.mw.protocol.p206V2.upVos.DataCd83OpenVo; import com.dy.common.mw.protocol.p206V202404.*; import com.dy.common.mw.protocol.p206V202404.parse.global.GlParse; import com.dy.common.mw.protocol.p206V202404.upVos.DataCdC2Vo; @@ -26,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, @@ -90,7 +88,7 @@ } } - return new MidResult[]{midRs, confirmCommand} ; + return new MidResult[]{confirmCommand, midRs} ; } /** * 鎵ц鍒嗘瀽 -- Gitblit v1.8.0