From 4fe39e9df868a8fdd40549f169adbea2e8bd622a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 27 十一月 2024 15:34:09 +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 | 8 ++++----
1 files changed, 4 insertions(+), 4 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 955e52f..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,
@@ -79,14 +79,14 @@
callback.callback(midRs.reportOrResponse_trueOrFalse);
if(para.data != null && para.data.getSubData() != null){
- Object subData = para.data.getSubData() ;
+ Object subData = ((DataV2)para.data.getSubData()).subData ;
if(subData instanceof DataCd83OpenVo){
callback.notify(new ValveStateInfo(true));
}else if(subData instanceof DataCd83CloseVo){
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