From 42f5453644c41d3b6ac9e381f931efdfc9da8178 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 27 五月 2024 16:09:56 +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 | 9 +++++++--
1 files changed, 7 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 4540010..dc2abe8 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) ;
@@ -312,6 +312,11 @@
index += 8 ;
cdData.startDt = GlParse.parseRtuDt(bs, index) ;
+ if(cdData.opResult == (byte)0x81){
+ //澶辫触浜嗭紝涓嬮潰灏辨病鏈夋暟鎹簡
+ return ;
+ }
+
index += 6 ;
cdData.endDt = GlParse.parseRtuDt(bs, index) ;
--
Gitblit v1.8.0