From dbb4ac17ff70578662af99c6b1772b5c0641d005 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 18:48:23 +0800
Subject: [PATCH] 1、基于Timer实现定时执行的任务,并在满足条件下结束定时任务,为此实现抽象类TimerTaskJob类,并在UpgradeManager类中应用; 2、TreadJob类由TimerTaskJob替换,弃用TreadJob类。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_C2_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/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 1a4d5f9..2408a64 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
@@ -80,7 +80,7 @@
}
callback.callback(midRs.reportOrResponse_trueOrFalse);
if(para.data != null && para.data.getSubData() != null){
- DataCdC2Vo subData = (DataCdC2Vo)para.data.getSubData() ;
+ DataCdC2Vo subData = (DataCdC2Vo)((DataV202404)para.data.getSubData()).subData ;
// public Byte opType2 ;//寮�鍚叧闂細0: 寮�鍚� -1:鍏抽棴
// public Boolean success ;//鎵ц缁撴灉锛坱rue鎴愬姛, false澶辫触锛�
if(subData.opType2.byteValue() == 0 && subData.success){
@@ -89,8 +89,8 @@
callback.notify(new ValveStateInfo(false));
}
}
-
- return new MidResult[]{midRs, confirmCommand} ;
+
+ return new MidResult[]{confirmCommand, midRs} ;
}
/**
* 鎵ц鍒嗘瀽
--
Gitblit v1.8.0