pipIrr-SV.git - Gitblit

			@@ -59,6 +59,7 @@
			this.clear();
			boolean isFail = false ;
			String upCode = null ;
			Object[] codeDataGrp = {null};
			try{
			CommonV202404 cp = new CommonV202404() ;
			Boolean p202404TrueUgFalse = cp.protocolType_p206TrueUgFalse(upBuffer) ;
			@@ -67,7 +68,6 @@
			if(crcStr != null){
			return new MidResult[]{(new MidResultError(ProtocolConstantV206V202404.protocolName, rtuAddr, "严重错误，上行数据CRC检查失败，" + crcStr, null))} ;
			}
			rtuAddr = cp.parseRtuAddr(upBuffer) ;
			upCode = cp.parseCode(upBuffer) ;
			if(upCode == null){
			return new MidResult[]{(new MidResultError(ProtocolConstantV206V202404.protocolName, rtuAddr, "严重错误，未能从上行数据中解析出功能码！", null))} ;
			@@ -101,12 +101,14 @@
			}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 = dV201.getRtuAddr() ;
			codeDataGrp[0] = codeData ;
			}
			@Override
			public void notify(NotifyInfo ...infos) {
			notify.notify(rtuAddr, ProtocolConstantV206V1.protocolName, ProtocolConstantV206V1.protocolVer, infos);
			}
			});
			}
			@@ -115,7 +117,7 @@
			isFail = true ;
			return new MidResult[]{(new MidResultError(ProtocolConstantV206V202404.protocolName, rtuAddr, "严重错误，分析Rtu数据出错！数据为：" + upHex + (e.getMessage() == null?"":("，出错信息：" + e.getMessage())), e))} ;
			} finally{
			callback.callback(rtuAddr, upCode, CodeV202404.getCodeName(upCode), upHex, reportOrResponse_trueOrFalse, isFail, rtuAddr);
			callback.callback(rtuAddr, upCode, CodeV202404.getCodeName(upCode), upHex, reportOrResponse_trueOrFalse, isFail, rtuAddr, codeDataGrp[0]);
			}
			}