From 93f13e7b2e046c6d86d10e7abc2ecaa4c4adabc3 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 21 十二月 2021 11:47:38 +0800
Subject: [PATCH] 完善tcp
---
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
index c2a75a4..bc51943 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
@@ -17,6 +17,7 @@
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
+import java.net.SocketAddress;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -98,7 +99,7 @@
return;
}
if (TextUtils.isEmpty(ipAddress)) {
- mSocket = SocketPool.getInstance().getUdpSocket1(new InetSocketAddress(port));
+ mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(port));
}
mSocket.setBroadcast(true);
mSocket.setReuseAddress(true);
@@ -122,15 +123,16 @@
@Override
public UdpSocketOptions getOptions() {
- return null;
+ return this.socketOptions;
}
+ @Override
public void onHandleResponse() throws Exception {
if (mSocket == null) {
return;
}
try {
- mSocket.receive(receivePacket);
+ mSocket.receive(receivePacket);
} catch (IOException e) {
e.printStackTrace();
}
@@ -139,14 +141,14 @@
}
//鎺掗櫎鑷繁鍙戝嚭鍘荤殑
try {
- if (IpUtils.isLocalIpAddress( receivePacket.getAddress().getHostAddress()))
+ if (IpUtils.isLocalIpAddress(receivePacket.getAddress().getHostAddress()))
return;
} catch (Exception ignored) {
}
try {
- LogUtils.i( "鎺ユ敹鍒癠dp鏁版嵁鍖咃紝缃戠粶鍦板潃锛�" + receivePacket.getAddress().getHostAddress() + ":" + receivePacket.getPort());
+ LogUtils.i("鎺ユ敹鍒癠dp鏁版嵁鍖咃紝缃戠粶鍦板潃锛�" + receivePacket.getAddress().getHostAddress() + ":" + receivePacket.getPort());
IHandleMessage handleMessage = getOptions().getHandleMessage();
if (handleMessage != null) {
@@ -155,17 +157,18 @@
handleMessage.read(data);
}
- }catch (Exception e){
+ } catch (Exception e) {
}
}
+
@Override
- public void sendMsg(InetSocketAddress inetSocketAddress, byte[] msg) throws Exception {
+ public void sendMsg(String ipAddress,int port, byte[] msg) throws Exception {
if (msg == null) {
return;
}
- final DatagramPacket sendPacket = new DatagramPacket(msg, msg.length, inetSocketAddress);
+ final DatagramPacket sendPacket = new DatagramPacket(msg, msg.length, InetAddress.getByName(ipAddress), port);
mSocket.send(sendPacket);
}
}
--
Gitblit v1.8.0