From 016d28eba8f0d8f8632828c4589a3b39274a5f02 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 07 五月 2025 14:58:37 +0800 Subject: [PATCH] 1、协议命令生成器增量开发,增加实现几个设置与对应的查询命令; 2、修改陈旧bug。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java index 16f2010..a328e05 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java @@ -24,7 +24,7 @@ @Override public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception { ParseParamsForUpV202404 para = (ParseParamsForUpV202404)params ; - int bsLen = new CommonV202404().parseDataLen(para.upBuffer) ; + int bsLen = new CommonV202404().parseDataLen4P202404(para.upBuffer) ; if(bsLen > 0){ this.doParse(para.upBuffer, bsLen, @@ -76,7 +76,7 @@ //浣庡姛鑰楁椂锛屽敖蹇彂閫� confirmCommand.isQuickSend = true ; } - callback.callback(midRs.reportOrResponse_trueOrFalse); + callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV202404)(para.data.subData)).subData); if(para.data != null && ((DataV202404)para.data.getSubData()).subData != null){ callback.notify(new ValveStateInfo(false)); } @@ -92,9 +92,9 @@ * @throws Exception 寮傚父 */ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { - DataV202404 dV1 = (DataV202404)data.getSubData() ; + DataV202404 dV202404 = (DataV202404)data.getSubData() ; DataCd85Vo cdData = new DataCd85Vo(CodeV202404.getCodeName(dataCode)) ; - dV1.subData = cdData ; + dV202404.subData = cdData ; GlParse.parseCd85(bs, cdData) ; } -- Gitblit v1.8.0