From dae44e71f055776501ebbb1d3524833a50ad439a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 24 二月 2025 15:34:29 +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/p206V202404/parse/global/GlParse.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
index e81594f..393601a 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
@@ -70,12 +70,16 @@
b = bs[index + 1] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
- vo.alarmInnerDoor = (byte)((b >> 1) & 1) ;
- vo.alarmOuterDoor = (byte)((b >> 2) & 1) ;
+ vo.alarmDoor = (byte)((b >> 1) & 1) ;
+ vo.alarmBatteryVolt = (byte)((b >> 2) & 1) ;
vo.alarmEleMiss = (byte)((b >> 3) & 1) ;
vo.alarmEleExceed = (byte)((b >> 4) & 1) ;
vo.alarmEleLowVolt = (byte)((b >> 5) & 1) ;
vo.stateIcEnable = (byte)((b >> 6) & 1) ;
+ vo.stateOpClValve = (byte)((b >> 7) & 1) ;
+
+ b = bs[index + 2] ;
+ vo.alarmBlockValve = (byte)(b & 0x1) ;
}
public static String parseTp(byte[] bs, short index){
@@ -237,7 +241,7 @@
cdData.projectNo = (int)bs[index];
index ++ ;
- cdData.opType = bs[index];
+ cdData.clType = bs[index];
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
--
Gitblit v1.8.0