From 10a0b0ca34824307aa7d23b0ad6679b36bd57842 Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 10 六月 2025 19:59:49 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_85_Up.java | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 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 4578f72..b269d95 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 @@ -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,11 +92,22 @@ * @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) ; } + public static void main(String[] args) throws Exception { + String hex = "695569813714250102011300850200090000000062090200300405007728936450391294344910100625485510100625683907000000000000000000001000000000000000000000100600000000000000000140000090004916"; + byte[] bs = ByteUtil.hex2Bytes(hex) ; + Cd_85_Up p = new Cd_85_Up() ; + Data d = new Data() ; + DataV202404 subd = new DataV202404() ; + d.subData = subd ; + p.doParse(bs, bs.length, "85", d); + System.out.println(d.toString()); + } + } -- Gitblit v1.8.0