From 9357012ee7684579464a2d9b5b7c6859245ba283 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 28 六月 2024 11:22:15 +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 | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 cfbc9e2..5336505 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
@@ -1,7 +1,7 @@
package com.dy.common.mw.protocol.p206V1_0_0.parse.global;
-import com.dy.common.mw.protocol.p206V1_0_0.DataAlarmVo;
-import com.dy.common.mw.protocol.p206V1_0_0.DataStateVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataAlarmVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataStateVo;
import com.dy.common.util.ByteUtil;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -11,25 +11,31 @@
private static final Logger log = LogManager.getLogger(GlParse.class);
public static DataAlarmVo parseAlarm(byte[] bs, short index){
+ /*
+ 11011111 (DF) + 11111001 (F9)
+ 鎶ヨ:
+ 钃勭數姹犵數鍘嬶細鎶ヨ
+ 婕忔崯锛氭姤璀�
+ 浠〃锛氭姤璀�
+ 闃�闂細鎶ヨ
+ */
DataAlarmVo avo = new DataAlarmVo() ;
byte b = bs[index] ;
- index++ ;
- avo.batteryVolt = (byte)(b & 0x2 >> 1) ;
- avo.loss = (byte)(b & 0x8 >> 3) ;
- avo.meter = (byte)(b & 0x20 >> 5) ;
+ avo.batteryVolt = (byte)((b & 0x2) >> 1) ;
+ avo.meter = (byte)((b & 0x20) >> 5) ;
- b = bs[index] ;
- avo.valve = (byte)(b & 0x20 >> 5) ;
+ b = bs[index + 1] ;
+ avo.loss = (byte)((b & 0x2) >> 1) ;
+ avo.valve = (byte)((b & 0x4) >> 2) ;
return avo ;
}
public static DataStateVo parseState(byte[] bs, short index){
DataStateVo avo = new DataStateVo() ;
byte b = bs[index] ;
- index++ ;
- avo.icCard = (byte)(b & 0x4 >> 2) ;
- avo.working = (byte)(b & 0x8 >> 3) ;
- avo.valve = (byte)(b & 0x20 >> 5) ;
+ avo.icCard = (byte)((b & 0x4) >> 2) ;
+ avo.working = (byte)((b & 0x10) >> 4) ;
+ avo.powerType = (byte)((b & 0x40) >> 6) ;
return avo ;
}
--
Gitblit v1.8.0