From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001 From: zhubaomin <zhubaomin> Date: 星期一, 07 四月 2025 15:18:51 +0800 Subject: [PATCH] 整理版本 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java index 54279c3..b1c73a6 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/DriverV1.java @@ -59,6 +59,7 @@ this.clear(); boolean isFail = false ; String upCode = null ; + Object[] codeDataGrp = {null}; try{ CommonV1 cp = new CommonV1() ; Boolean p206TrueUgFalse = cp.protocolType_p206TrueUgFalse(upBuffer) ; @@ -100,9 +101,10 @@ }else{ return codeParse.parse(isLowPower, this.upCpParams, new CodeParseCallback(){ @Override - public void callback(Boolean flag) { + public void callback(Boolean flag, Object codeData) { reportOrResponse_trueOrFalse = flag ; rtuAddrInData = dV1.getRtuAddr() ; + codeDataGrp[0] = codeData ; } @Override public void notify(NotifyInfo ...infos) { @@ -116,7 +118,7 @@ } finally{ if(upCode != null){ //CRC楠岃瘉澶辫触鏃讹紝upCode涓簄ull锛屾鏃朵笉杩涜鍥炶皟 - callback.callback(rtuAddr, upCode, CodeV1.getCodeName(upCode), upHex, reportOrResponse_trueOrFalse, isFail, rtuAddr); + callback.callback(rtuAddr, upCode, CodeV1.getCodeName(upCode), upHex, reportOrResponse_trueOrFalse, isFail, rtuAddr, codeDataGrp[0]); } } } -- Gitblit v1.8.0