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_C0_Up.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_C0_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_C0_Up.java
index d07080e..b5bf2a2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_C0_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_C0_Up.java
@@ -1,11 +1,8 @@
package com.dy.common.mw.protocol.p206V2.parse;
import com.dy.common.mw.protocol.*;
-import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.mw.protocol.p206V2.*;
import com.dy.common.mw.protocol.p206V2.parse.global.GlParse;
-import com.dy.common.mw.protocol.p206V2.upVos.DataCd81Vo;
-import com.dy.common.mw.protocol.p206V2.upVos.DataCd84Vo;
import com.dy.common.mw.protocol.p206V2.upVos.DataCdC0Vo;
import com.dy.common.mw.protocol.rtuState.ValveStateInfo;
import com.dy.common.util.ByteUtil;
@@ -26,7 +23,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,
@@ -79,15 +76,15 @@
confirmCommand.isQuickSend = true ;
}
- 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){
- DataCdC0Vo cdData = (DataCdC0Vo)para.data.getSubData() ;
+ DataCdC0Vo cdData = (DataCdC0Vo)((DataV2)para.data.getSubData()).subData ;
if(cdData.stateVo != null && cdData.stateVo.valveState != null){
callback.notify(new ValveStateInfo(cdData.stateVo.valveState.byteValue()== 1?false:true));
}
}
- return new MidResult[]{midRs, confirmCommand} ;
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
--
Gitblit v1.8.0