From e6f86688b8f6fa0d03cf88012f80759cd290af27 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 13 六月 2024 14:37:48 +0800
Subject: [PATCH] 1、靳总协议报警及状态解决完善代码； 2、报警及状态处理完善；
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index 8a5f836..0f0b19e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -15,11 +15,11 @@
byte b = bs[index] ;
index++ ;
avo.batteryVolt = (byte)(b & 0x2 >> 1) ;
- avo.loss = (byte)(b & 0x8 >> 3) ;
avo.meter = (byte)(b & 0x20 >> 5) ;
b = bs[index] ;
- avo.valve = (byte)(b & 0x20 >> 5) ;
+ avo.loss = (byte)(b & 0x2 >> 1) ;
+ avo.valve = (byte)(b & 0x4 >> 2) ;
return avo ;
}
@@ -28,8 +28,8 @@
byte b = bs[index] ;
index++ ;
avo.icCard = (byte)(b & 0x4 >> 2) ;
- avo.working = (byte)(b & 0x8 >> 3) ;
- avo.valve = (byte)(b & 0x20 >> 5) ;
+ avo.working = (byte)(b & 0x10 >> 4) ;
+ avo.powerType = (byte)(b & 0x40 >> 6) ;
return avo ;
}
--
Gitblit v1.8.0