From a37eca3ea9ad0d895ec8bb5af8c0d0b90da3169e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 10 十二月 2021 17:04:59 +0800
Subject: [PATCH] 2021-12-10 1.更新

---
 HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/UdpClient.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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 a2f7c2f..1f3dab9 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
@@ -5,6 +5,7 @@
 
 import com.hdl.sdk.common.HDLSdk;
 import com.hdl.sdk.common.utils.IpUtils;
+import com.hdl.sdk.common.utils.LogUtils;
 import com.hdl.sdk.common.utils.ThreadToolUtils;
 import com.hdl.sdk.socket.SocketBoot;
 import com.hdl.sdk.socket.SocketOptions;
@@ -18,6 +19,7 @@
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -124,7 +126,7 @@
             return;
         }
         try {
-            mSocket.receive(receivePacket);
+           mSocket.receive(receivePacket);
         } catch (IOException e) {
             e.printStackTrace();
             isConnect.set(false);
@@ -134,21 +136,21 @@
         }
         //鎺掗櫎鑷繁鍙戝嚭鍘荤殑
         try {
-            if (receivePacket.getAddress().getHostAddress()
-                    .equals(IpUtils.getIP(HDLSdk.getInstance().getContext()))) {
+            if (IpUtils.isLocalIpAddress( receivePacket.getAddress().getHostAddress()))
                 return;
-            }
         } catch (Exception ignored) {
 
         }
 
         IHandleMessage handleMessage = getOptions().getHandleMessage();
         if (handleMessage != null) {
-            handleMessage.read(receivePacket.getData());
+            byte[] data = new byte[receivePacket.getLength()];
+            System.arraycopy(receivePacket.getData(), 0, data, 0, data.length);
+            handleMessage.read(data);
         }
         final String receive = new String(receivePacket.getData(), 0, receivePacket.getLength());
 
-        Log.d("---->", receive + " from " + receivePacket.getAddress().getHostAddress() + ":" + receivePacket.getPort());
+        LogUtils.d("---->", receive + " from " + receivePacket.getAddress().getHostAddress() + ":" + receivePacket.getPort());
 
         //閲嶇疆闀垮害
         if (receivePacket != null) {

--
Gitblit v1.8.0