From 017bfd52644c196a9a6d1fc8414a21a6320838b1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 02 六月 2024 20:26:27 +0800
Subject: [PATCH] 远程命令结果数据库保存实现
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 ee77255..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 ;
}
--
Gitblit v1.8.0