From 04779efe2410fb0df1ff983b26384d56471b85cf Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 08 十一月 2024 08:50:52 +0800
Subject: [PATCH] RTU远程升级管理及相关代码适应性调整与修改
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/PrefixedDataAvailableV1.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/PrefixedDataAvailableV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/PrefixedDataAvailableV1.java
index 139b92a..d51dba2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/PrefixedDataAvailableV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/PrefixedDataAvailableV1.java
@@ -35,8 +35,8 @@
*/
public PrefixedDataAvailableStatus forOnLine(IoBuffer in,
int remain,
- int minDataLength, //瀵瑰簲ProtocolConstantV2_0.onLineDataMinLength
- int maxDataLength //瀵瑰簲ProtocolConstant.errorMaxLength
+ int minDataLength,
+ int maxDataLength
) throws Exception {
int oldPosition = in.position() ;
@@ -92,16 +92,15 @@
return new PrefixedDataAvailableStatus().rubbish(remain) ;
}
-
CommonV1 parseCommon = new CommonV1();
- boolean isThisProtocolData = parseCommon.isThisProtocolHead(preByte) ;
+ Boolean[] isThisProtocolData = parseCommon.isThisProtocolHead(preByte) ;
- if(!isThisProtocolData){
- //涓嶆槸鏈崗璁暟鎹�
+ if(isThisProtocolData == null || isThisProtocolData.length != 2 || !isThisProtocolData[0].booleanValue()){
+ //涓嶆槸鏈琑TU鐨勫崗璁暟鎹�
return null ;
}
- Integer dataLen = parseCommon.parseFrameLen(preByte) ;
+ Integer dataLen = parseCommon.parseFrameLen(preByte, isThisProtocolData[1]) ;
if(dataLen == null){
String headHex = ByteUtil.bytes2Hex(preByte, true) ;
--
Gitblit v1.8.0