From 6d31770c150bcaf17a5814bc2aff8b9754f89525 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 16 五月 2024 17:31:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'git-pipIrr/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 3 +--
1 files changed, 1 insertions(+), 2 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 7d57f49..6f32f1c 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
@@ -58,7 +58,7 @@
* @return
*/
public static void parseAlarmAndState(byte[] bs, int index, AlarmVo vo){
- byte b = bs[index] ;
+ byte b = bs[index + 1] ;
vo.statePump = (byte)(b & 0x1) ;
vo.alarmWaterRemain = (byte)(b >> 1 & 1) ;
vo.alarm0WaterRemain = (byte)(b >> 2 & 1) ;
@@ -68,7 +68,6 @@
vo.alarmWaterMeterBreak = (byte)(b >> 6 & 1) ;
vo.alarmEleMeterFault = (byte)(b >> 7 & 1) ;
- index++ ;
b = bs[index] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
vo.alarmInnerDoor = (byte)(b >> 1 & 1) ;
--
Gitblit v1.8.0