From b31baa25c1c11788b2997d536158ddb8436727df Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 20 五月 2024 21:38:30 +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 | 12 ++++++------
1 files changed, 6 insertions(+), 6 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 6f32f1c..82e681d 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 + 1] ;
+ byte b = bs[index] ;
vo.statePump = (byte)(b & 0x1) ;
vo.alarmWaterRemain = (byte)(b >> 1 & 1) ;
vo.alarm0WaterRemain = (byte)(b >> 2 & 1) ;
@@ -68,7 +68,7 @@
vo.alarmWaterMeterBreak = (byte)(b >> 6 & 1) ;
vo.alarmEleMeterFault = (byte)(b >> 7 & 1) ;
- b = bs[index] ;
+ b = bs[index + 1] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
vo.alarmInnerDoor = (byte)(b >> 1 & 1) ;
vo.alarmOuterDoor = (byte)(b >> 2 & 1) ;
@@ -179,9 +179,9 @@
cdData.elePrice = elePrice/100.0D;
index += 2 ;
- GlParse.parseAlarmAndState(bs, index, cdData) ;
+ GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
- index += 2 ;
+ index += 4 ;
int aVolt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.aVolt = aVolt/10.0D;
@@ -279,7 +279,7 @@
cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
index += 2 ;
- GlParse.parseAlarmAndState(bs, index, cdData) ;
+ GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
}
/**
* 鍒嗘瀽鍔熻兘93銆丄3鏁版嵁
@@ -340,6 +340,6 @@
cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
index += 2 ;
- GlParse.parseAlarmAndState(bs, index, cdData) ;
+ GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
}
}
--
Gitblit v1.8.0