From b8e8696b61f4a896b16269157e7b85aa7b590009 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 27 三月 2024 17:13:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 a41e004..21e888e 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 @@ -27,8 +27,8 @@ DataStateVo avo = new DataStateVo() ; byte b = bs[index] ; index++ ; - avo.idCard = (byte)(b & 0x4) ; - avo.work = (byte)(b & 0x8) ; + avo.icCard = (byte)(b & 0x4) ; + avo.working = (byte)(b & 0x8) ; avo.valve = (byte)(b & 0x20) ; return avo ; } -- Gitblit v1.8.0