From e9c5dd944c69854b0156c321014f307c064a69bc Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期一, 03 六月 2024 09:58:36 +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/p206V1_0_0/parse/global/GlParse.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 21e888e..cfbc9e2 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
@@ -14,12 +14,12 @@
DataAlarmVo avo = new DataAlarmVo() ;
byte b = bs[index] ;
index++ ;
- avo.batteryVolt = (byte)(b & 0x2) ;
- avo.loss = (byte)(b & 0x8) ;
- avo.meter = (byte)(b & 0x20) ;
+ 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) ;
+ avo.valve = (byte)(b & 0x20 >> 5) ;
return avo ;
}
@@ -27,9 +27,9 @@
DataStateVo avo = new DataStateVo() ;
byte b = bs[index] ;
index++ ;
- avo.icCard = (byte)(b & 0x4) ;
- avo.working = (byte)(b & 0x8) ;
- avo.valve = (byte)(b & 0x20) ;
+ avo.icCard = (byte)(b & 0x4 >> 2) ;
+ avo.working = (byte)(b & 0x8 >> 3) ;
+ avo.valve = (byte)(b & 0x20 >> 5) ;
return avo ;
}
@@ -44,7 +44,7 @@
index++ ;
dt = ByteUtil.BCD2String_BE(bs, index, index) + " " + dt ;//鏃�
index++ ;
- bs[index] = (byte)(bs[index] & 0x10);
+ //bs[index] = (byte)(bs[index] & 0x10);
dt = ByteUtil.BCD2String_BE(bs, index, index) + "-" + dt ;//鏈�
index++ ;
dt = "20" + ByteUtil.BCD2String_BE(bs, index, index) + "-" + dt ;//骞�
--
Gitblit v1.8.0