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/p206V1/parse/Cd_10_Up.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java
index 8c7d5da..21e4b05 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/parse/Cd_10_Up.java
@@ -25,7 +25,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,
@@ -60,7 +60,7 @@
         DataV1 dV1 = (DataV1)data.getSubData() ;
         DataCd10Vo cdData = new DataCd10Vo() ;
         dV1.subData = cdData ;
-        cdData.newRtuAddr = new CommonV1().parseRtuAddr(bs, ProtocolConstantV206V1.dataIndex) ;
+        cdData.newRtuAddr = new CommonV1().parseRtuAddr(bs, ProtocolConstantV206V1.dataIndex, true) ;
     }
 
 }

--
Gitblit v1.8.0