From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 二月 2025 14:33:15 +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/OnLineV2.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/OnLineV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java
index 7ca3647..9fd8559 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/OnLineV2.java
@@ -2,11 +2,11 @@
import com.dy.common.mw.protocol.AnnotationOnLine;
import com.dy.common.mw.protocol.OnLine;
-import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
@AnnotationOnLine(
enable = true,
protocolName = ProtocolConstantV206V2.protocolName,
+ protocolVersion = ProtocolConstantV206V2.protocolVer,
priority = ProtocolConstantV206V2.priority)
@SuppressWarnings("unused")
public class OnLineV2 implements OnLine{
@@ -20,12 +20,12 @@
public OnLineResult parse(byte[] upBuf)throws Exception {
OnLineResult olr = new OnLineResult() ;
CommonV2 cp = new CommonV2() ;
- Boolean flag = cp.isThisProtocolHead(upBuf) ;
- if(flag == null){
+ Boolean[] isThis_p206Pgu = cp.isThisProtocolHead(upBuf) ;
+ if(isThis_p206Pgu == null || isThis_p206Pgu.length != 2){
//鍑洪敊
olr.result = OnLine.OnLineAction_fail ;
olr.rtuAddr = null ;
- }else if(!flag.booleanValue()){
+ }else if(!isThis_p206Pgu[0].booleanValue()){
//涓嶆槸鏈崗璁暟鎹�
olr.result = OnLine.OnLineAction_success_noMe ;
olr.rtuAddr = null ;
--
Gitblit v1.8.0