From 081a60a94c9c6a927b5a417e4b34c732dacd7bc6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十一月 2024 13:34:04 +0800
Subject: [PATCH] 修改升级监视功能模块,增加查询条件
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/PrefixedDataAvailableV2.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/PrefixedDataAvailableV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/PrefixedDataAvailableV2.java
index a5f5c86..43fa369 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/PrefixedDataAvailableV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/PrefixedDataAvailableV2.java
@@ -94,14 +94,13 @@
CommonV2 parseCommon = new CommonV2();
- boolean isThisProtocolData = parseCommon.isThisProtocolHead(preByte) ;
-
- if(!isThisProtocolData){
+ Boolean[] isThisProtocolData = parseCommon.isThisProtocolHead(preByte) ;
+ if(isThisProtocolData == null || isThisProtocolData.length != 2 || !isThisProtocolData[0].booleanValue()){
//涓嶆槸鏈崗璁暟鎹�
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