From 584989385e05b8ad887431da2ab7da1e93e1ffaa Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 03 三月 2025 14:59:52 +0800 Subject: [PATCH] 大屏展示,消息推送部分优化 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_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/p206V2/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java index 6d2b8c7..1b8ec30 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/parse/Cd_83_Up.java @@ -24,7 +24,7 @@ @Override public MidResult[] parse(Boolean isLowPower, CodeParseParams params, CodeParseCallback callback)throws Exception { ParseParamsForUpV2 para = (ParseParamsForUpV2)params ; - int bsLen = new CommonV2().parseDataLen(para.upBuffer) ; + int bsLen = new CommonV2().parseDataLen4P206(para.upBuffer) ; if(bsLen > 0){ this.doParse(para.upBuffer, bsLen, @@ -77,7 +77,7 @@ confirmCommand.isQuickSend = true ; } - callback.callback(midRs.reportOrResponse_trueOrFalse); + callback.callback(midRs.reportOrResponse_trueOrFalse, para.data.subData==null?null:((DataV2)(para.data.subData)).subData); if(para.data != null && para.data.getSubData() != null){ Object subData = ((DataV2)para.data.getSubData()).subData ; if(subData instanceof DataCd83OpenVo){ @@ -86,7 +86,7 @@ callback.notify(new ValveStateInfo(false)); } } - return new MidResult[]{midRs, confirmCommand} ; + return new MidResult[]{confirmCommand, midRs} ; } /** * 鎵ц鍒嗘瀽 @@ -222,7 +222,7 @@ Data data = new Data() ; data.setSubData(new DataV2()) ; - int bsLen = new CommonV2().parseDataLen(bs) ; + int bsLen = new CommonV2().parseDataLen4P206(bs) ; if(bsLen > 0){ try { obj.doParse(bs, -- Gitblit v1.8.0