From 842237345ac469b02e9add8f9fd8bae5d4f7cdac Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期二, 25 二月 2025 14:33:15 +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_9603_Up.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_9603_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_9603_Up.java index 8dd7280..571b79c 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_9603_Up.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_9603_Up.java @@ -45,7 +45,7 @@ midRs.reportOrResponse_trueOrFalse = 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 && para.data.getSubData() != null){ DataCd960XVo subData = (DataCd960XVo)((DataV202404)para.data.getSubData()).subData ; callback.notify(new UpgradeStateInfo(subData.success)); @@ -61,9 +61,9 @@ * @throws Exception 寮傚父 */ protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception { - DataV202404 dV2 = (DataV202404)data.getSubData() ; + DataV202404 dV202404 = (DataV202404)data.getSubData() ; DataCd960XVo cdData = new DataCd960XVo() ; - dV2.subData = cdData ; + dV202404.subData = cdData ; if(bs[ProtocolConstantV206V202404.UG_dataIndex] == (byte)0x00){ cdData.success = true ; }else{ -- Gitblit v1.8.0