From 87a49ccc47abbb3505403d174001ceb3a2d2341d Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期五, 08 十一月 2024 09:02:46 +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/p206V1/parse/Cd_93_Up.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_93_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_93_Up.java index 4ff8fc6..3b7d704 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_93_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_93_Up.java @@ -2,7 +2,6 @@ import com.dy.common.mw.protocol.*; import com.dy.common.mw.protocol.p206V1.*; -import com.dy.common.mw.protocol.p206V1.upVos.DataCd92Vo; import com.dy.common.mw.protocol.p206V1.upVos.DataCd93Vo; import com.dy.common.mw.protocol.rtuState.ValveStateInfo; import com.dy.common.util.ByteUtil; @@ -29,7 +28,7 @@ @Override public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception { ParseParamsForUpV1 para = (ParseParamsForUpV1)params ; - int bsLen = new CommonV1().parseDataLen(para.upBuffer) ; + int bsLen = new CommonV1().parseDataLen4P206(para.upBuffer) ; if(bsLen > 0){ this.doParse(para.upBuffer, bsLen, @@ -51,7 +50,7 @@ callback.callback(midRs.reportOrResponse_trueOrFalse); if(para.data != null && para.data.getSubData() != null){ - DataCd93Vo subData = (DataCd93Vo)para.data.getSubData() ; + DataCd93Vo subData = (DataCd93Vo)((DataV1)para.data.getSubData()).subData ; callback.notify(new ValveStateInfo(!subData.success)); } -- Gitblit v1.8.0