From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
sdk/src/main/java/com/hdl/sdk/link/socket/client/UdpClient.java | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/sdk/src/main/java/com/hdl/sdk/link/socket/client/UdpClient.java b/sdk/src/main/java/com/hdl/sdk/link/socket/client/UdpClient.java
index dabde48..03c07b2 100644
--- a/sdk/src/main/java/com/hdl/sdk/link/socket/client/UdpClient.java
+++ b/sdk/src/main/java/com/hdl/sdk/link/socket/client/UdpClient.java
@@ -67,8 +67,9 @@
/**
* 鍒濆鍖栧弬鏁�
- * @param ipAddress 鏈湴鐩戝惉绔彛
- * @param port 鏈湴鐩戝惉绔彛
+ *
+ * @param ipAddress 鏈湴鐩戝惉绔彛
+ * @param port 鏈湴鐩戝惉绔彛
* @param socketOptions
*/
public UdpClient(String ipAddress, int port, UdpSocketOptions socketOptions) {
@@ -77,13 +78,14 @@
this.socketOptions = socketOptions;
byte[] receiveByte = new byte[BUFFER];
receivePacket = new DatagramPacket(receiveByte, receiveByte.length);
- this.lock= socketOptions.getWifiManager().createMulticastLock("UDPwifi");
+ this.lock = socketOptions.getWifiManager().createMulticastLock("UDPwifi");
}
/**
* 鍒濆鍖栧弬鏁�
+ *
* @param ipAddress 鏈湴鐩戝惉IP鍦板潃
- * @param port 鏈湴鐩戝惉绔彛
+ * @param port 鏈湴鐩戝惉绔彛
* @param options
* @return
*/
@@ -93,7 +95,8 @@
/**
* 鍒濆鍖栧弬鏁�
- * @param port 鏈湴鐩戝惉绔彛
+ *
+ * @param port 鏈湴鐩戝惉绔彛
* @param options
* @return
*/
@@ -111,12 +114,12 @@
lock.acquire();
if (TextUtils.isEmpty(ipAddress)) {
- mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress( port));
- }
- else{
+ mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(port));
+ } else {
mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(Inet4Address.getByName(ipAddress), port));
}
- mSocket.joinGroup(InetAddress.getByName(socketOptions.getGroupAddress()));
+ //鍘绘帀 缁勫湴鍧�锛堝厜浼廰pp涓嶅悓缃戞涓嶅厑璁革級 2025骞�04鏈�01鏃�15:43:58
+// mSocket.joinGroup(InetAddress.getByName(socketOptions.getGroupAddress()));
mSocket.setSoTimeout(socketOptions.getSoTimeOut());
mSocket.setBroadcast(true);
// mSocket.setReuseAddress(true);
@@ -170,13 +173,12 @@
byte[] data = new byte[receivePacket.getLength()];
System.arraycopy(receivePacket.getData(), 0, data, 0, data.length);
- if(mSocket.getLocalPort()== HDLBusProConnect.UDP_PORT){
+ if (mSocket.getLocalPort() == HDLBusProConnect.UDP_PORT) {
//Bus鍗忚锛屾湰韬病鏈変富棰橈紝榛樿鐢ㄤ笂鎶ョ殑涓婚锛屾柟渚縝us瑙ｆ瀽鍣ㄨ兘璁㈤槄鏀跺埌鏁版嵁
- LinkPacket linkPacket=new LinkPacket(String.format(TopicConstant.NATIVE_BUSPRO_UP, receivePacket.getAddress().getHostAddress()), data);
+ LinkPacket linkPacket = new LinkPacket(String.format(TopicConstant.NATIVE_BUSPRO_UP, receivePacket.getAddress().getHostAddress()), data);
linkPacket.setNativeType(NativeType.BusPro);
QueueUtils.getInstance().add(linkPacket);
- }
- else {
+ } else {
//link鍗忚
socketOptions.getHandleMessage().read(new Packet(data));
}
@@ -188,7 +190,7 @@
@Override
- public void sendMsg(String ipAddress,int port, byte[] msg) throws Exception {
+ public void sendMsg(String ipAddress, int port, byte[] msg) throws Exception {
if (msg == null) {
return;
}
@@ -196,10 +198,10 @@
// if (mSocket != null) {
// mSocket.send(sendPacket);
// } else {
- DatagramSocket datagramSocket = new DatagramSocket();
- datagramSocket.setBroadcast(true);
- datagramSocket.send(sendPacket);
- datagramSocket.close();
+ DatagramSocket datagramSocket = new DatagramSocket();
+ datagramSocket.setBroadcast(true);
+ datagramSocket.send(sendPacket);
+ datagramSocket.close();
// sendPacket = new DatagramPacket(msg, msg.length, InetAddress.getByName(socketOptions.getGroupAddress()), port);
// MulticastSocket multicastSocket = new MulticastSocket();
// multicastSocket.setReuseAddress(true);
--
Gitblit v1.8.0