From 11cea3249fd58d59d7c1d644b1cfff6a547921c2 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 16 二月 2022 13:07:10 +0800
Subject: [PATCH] Merge branch 'dev-hxb'
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
index 010263f..3c8363f 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
@@ -359,9 +359,10 @@
*
* @param topic 鍙戦�佹暟鎹�
* @param bodyStr 鍥炲鐨勪富棰�
+ * @param broadcast 鏄惁瑕佸箍鎾�
* @param callBack 鍥炶皟
*/
- public void udpSendMsg(String topic, String bodyStr, HDLLinkResponseCallBack callBack) {
+ public void udpSendMsg(String topic, String bodyStr,boolean broadcast, HDLLinkResponseCallBack callBack) {
if (TextUtils.isEmpty(topic) || TextUtils.isEmpty(bodyStr)) {
if (callBack != null) {
callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_DATA_NULL_ERROR));
@@ -378,6 +379,9 @@
LinkRequest message = new LinkRequest(topic, bodyStr);
String ip = HDLLinkConfig.getInstance().getIpAddress();
+ if(broadcast) {
+ ip = IpUtils.getBroadcastAddress();
+ }
HdlSocketHelper.sendUdp(getUdpBoot(), ip, UDP_PORT, message, new HdlSocketHelper.HdlSocketListener() {
@Override
public void onSucceed(Object msg) {
@@ -399,8 +403,9 @@
*
* @param topic 鍙戦�佹暟鎹�
* @param bodyStr 鍥炲鐨勪富棰�
+ * @param broadcast 鏄惁骞挎挱
*/
- public void udpSendMsg(String topic, String bodyStr) {
+ public void udpSendMsg(String topic, String bodyStr,boolean broadcast) {
if (TextUtils.isEmpty(topic) || TextUtils.isEmpty(bodyStr)) {
LogUtils.e("udpSendMsg", "鍙傛暟涓嶈兘涓虹┖");
return;
@@ -410,7 +415,10 @@
return;
}
LinkRequest message = new LinkRequest(topic, bodyStr);
- String ip = HDLLinkConfig.getInstance().getIpAddress();// IpUtils.getBroadcastAddress();
+ String ip = HDLLinkConfig.getInstance().getIpAddress();
+ if(broadcast) {
+ ip = IpUtils.getBroadcastAddress();
+ }
HdlSocketHelper.sendUdpOne(getUdpBoot(), ip, UDP_PORT, message);
}
--
Gitblit v1.8.0