From e2f95ff358f47a19da9908f3340ead5261bb5fbf Mon Sep 17 00:00:00 2001 From: weidong Date: Thu, 6 Jun 2024 15:00:17 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0ntrip=20proxy?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/D331RtcmMessageExecutor.java | 2 +- .../ntripproxy/executor/D341GgaMessageExecutor.java | 4 ++-- .../com/imdroid/ntripproxy/service/UDPClient.java | 13 +++++++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D331RtcmMessageExecutor.java b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D331RtcmMessageExecutor.java index 194a7828..3802e700 100644 --- a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D331RtcmMessageExecutor.java +++ b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D331RtcmMessageExecutor.java @@ -28,7 +28,7 @@ public class D331RtcmMessageExecutor implements Executor // 推送基站数据 byte[] srcData = new byte[message.getSrcBuf().readableBytes()]; message.getSrcBuf().getBytes(0,srcData); - rtcmClient.sendMessage(srcData); + rtcmClient.send(srcData); return null; } diff --git a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D341GgaMessageExecutor.java b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D341GgaMessageExecutor.java index 6d2fccab..9848dbb5 100644 --- a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D341GgaMessageExecutor.java +++ b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/executor/D341GgaMessageExecutor.java @@ -35,9 +35,9 @@ public class D341GgaMessageExecutor implements Executor { message.getSrcBuf().getBytes(0, srcData); // send to ntrip server - ntripClient.sendMessage(transData); + ntripClient.sendWithDebug(transData); // send to rtcm server - rtcmClient.sendMessage(srcData); + rtcmClient.send(srcData); } catch (Exception e){ logger.error("Exception {}",e); diff --git a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java index 5f333d72..f3673aa7 100644 --- a/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java +++ b/sec-ntrip-proxy/src/main/java/com/imdroid/ntripproxy/service/UDPClient.java @@ -1,5 +1,6 @@ package com.imdroid.ntripproxy.service; +import com.imdroid.common.util.DataTypeUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.net.DatagramPacket; @@ -29,15 +30,19 @@ public class UDPClient { } } - public void sendMessage(byte[] data) { + public void send(byte[] data) { try { - /*if (logger.isDebugEnabled()) { - logger.debug("推送udp {}: {}", port, DataTypeUtil.getHexString(data)); - }*/ DatagramPacket packet = new DatagramPacket(data, data.length, inetAddress, port); socket.send(packet); } catch (Exception e) { logger.error("推送异常:", e); } } + + public void sendWithDebug(byte[] data) { + if (logger.isDebugEnabled()) { + logger.debug("推送udp {}: {}", port, DataTypeUtil.getHexString(data)); + } + send(data); + } }