From 6be968854d7a134cf31b8af7b8ffb219da5cee55 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 05 七月 2024 16:36:40 +0800
Subject: [PATCH] p206V1.0.0协议与硬件联调，并修改完善代码。
---
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 2f087bc..6e5a7a9 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
@@ -20,11 +20,11 @@
闃�闂細鎶ヨ
*/
DataAlarmVo avo = new DataAlarmVo() ;
- byte b = bs[index + 1] ;
+ byte b = bs[index] ;
avo.batteryVolt = (byte)((b & 0x2) >> 1) ;
avo.meter = (byte)((b & 0x20) >> 5) ;
- b = bs[index] ;
+ b = bs[index + 1] ;
avo.loss = (byte)((b & 0x2) >> 1) ;
avo.valve = (byte)((b & 0x4) >> 2) ;
return avo ;
@@ -32,9 +32,9 @@
public static DataStateVo parseState(byte[] bs, short index){
DataStateVo avo = new DataStateVo() ;
- byte b = bs[index + 1] ;
+ byte b = bs[index] ;
avo.icCard = (byte)((b & 0x4) >> 2) ;
- avo.working = (byte)((b & 0x10) >> 4) ;
+ avo.valveState = (byte)((b & 0x10) >> 4) ;
avo.powerType = (byte)((b & 0x40) >> 6) ;
return avo ;
}
--
Gitblit v1.8.0