From d5dab07dc674de7edbbc1bd6ade0486f54fbdb26 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 06 五月 2025 19:19:35 +0800 Subject: [PATCH] 1、实现万用token(0000-0000-1234-9876-5); 2、web端单独实现命令结果等待器,并修改相关部分; 3、web端实现透传命令; 4、修改一些不当注释; 5、优化一些代码。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 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 960178c..a2df974 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 @@ -61,6 +61,14 @@ public static void parseAlarmAndState(byte[] bs, int index, AlarmVo vo){ byte b = bs[index] ; vo.statePump = (byte)(b & 0x1) ; + + //涓庢祴鎺т竴浣撻榾鍏煎 + if(vo.statePump == 0){ + vo.statePump = (byte)1; + }else{ + vo.statePump = (byte)0; + } + vo.alarmWaterRemain = (byte)((b >> 1) & 1) ; vo.alarm0WaterRemain = (byte)((b >> 2) & 1) ; vo.alarmExceedYear = (byte)((b >> 3) & 1) ; @@ -287,6 +295,10 @@ index += 2 ; GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭 + + index += 4 ; + cdData.price = ByteUtil.BCD2Int_LE(bs, index, index + 1)/100.0 ; + } /** * 鍒嗘瀽鍔熻兘93銆丄3鏁版嵁 -- Gitblit v1.8.0