From 433bb0003d9341647576251c9031148fb8145d43 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 六月 2024 16:10:57 +0800
Subject: [PATCH] 1、通信协议报警解析部分修改； 2、SsoCtrl.java中增加注释; 3、代码完善。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
index dc2abe8..e81594f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
@@ -53,29 +53,29 @@
/**
* 鍒嗘瀽鐘舵�佷笌鎶ヨ
- * @param bs
- * @param index
+ * @param bs 涓婃姤鏁版嵁鐨勫瓧鑺傛暟缁�
+ * @param index 褰撳墠瑙ｆ瀽鏁扮粍涓嬫爣浣嶇疆
* @return
*/
public static void parseAlarmAndState(byte[] bs, int index, AlarmVo vo){
byte b = bs[index] ;
vo.statePump = (byte)(b & 0x1) ;
- vo.alarmWaterRemain = (byte)(b >> 1 & 1) ;
- vo.alarm0WaterRemain = (byte)(b >> 2 & 1) ;
- vo.alarmExceedYear = (byte)(b >> 3 & 1) ;
- vo.alarmWaterMeterFault = (byte)(b >> 4 & 1) ;
- vo.alarmSteal = (byte)(b >> 5 & 1) ;
- vo.alarmWaterMeterBreak = (byte)(b >> 6 & 1) ;
- vo.alarmEleMeterFault = (byte)(b >> 7 & 1) ;
+ vo.alarmWaterRemain = (byte)((b >> 1) & 1) ;
+ vo.alarm0WaterRemain = (byte)((b >> 2) & 1) ;
+ vo.alarmExceedYear = (byte)((b >> 3) & 1) ;
+ vo.alarmWaterMeterFault = (byte)((b >> 4) & 1) ;
+ vo.alarmSteal = (byte)((b >> 5) & 1) ;
+ vo.alarmWaterMeterBreak = (byte)((b >> 6) & 1) ;
+ vo.alarmEleMeterFault = (byte)((b >> 7) & 1) ;
b = bs[index + 1] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
- vo.alarmInnerDoor = (byte)(b >> 1 & 1) ;
- vo.alarmOuterDoor = (byte)(b >> 2 & 1) ;
- vo.alarmEleMiss = (byte)(b >> 3 & 1) ;
- vo.alarmEleExceed = (byte)(b >> 4 & 1) ;
- vo.alarmEleLowVolt = (byte)(b >> 5 & 1) ;
- vo.stateIcEnable = (byte)(b >> 6 & 1) ;
+ vo.alarmInnerDoor = (byte)((b >> 1) & 1) ;
+ vo.alarmOuterDoor = (byte)((b >> 2) & 1) ;
+ vo.alarmEleMiss = (byte)((b >> 3) & 1) ;
+ vo.alarmEleExceed = (byte)((b >> 4) & 1) ;
+ vo.alarmEleLowVolt = (byte)((b >> 5) & 1) ;
+ vo.stateIcEnable = (byte)((b >> 6) & 1) ;
}
public static String parseTp(byte[] bs, short index){
--
Gitblit v1.8.0