From d8bf4f4d66715f002d024cae92862c1d83daa425 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期日, 12 十二月 2021 22:06:35 +0800
Subject: [PATCH] 更改了udp的机制
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 160 -----------------------------------------------------
1 files changed, 0 insertions(+), 160 deletions(-)
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
index 5f82461..8489b60 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
@@ -50,40 +50,14 @@
*/
public class HDLSocket {
-// public interface CallBack extends BaseCallBack {
-// void onResponse(String data);
-// }
-//
-// /**
-// * udp榛樿缁勬挱ip
-// */
-// private static final String UDP_GROUP_IP = "239.0.168.188";
-
- /**
- * udp榛樿绔彛
- */
- private static final int UDP_PORT = 8585;
-
/**
* tcp榛樿绔彛
*/
private static final int TCP_PORT = 8586;
- // private String tcpIp;
-// private int tcpPort;
-
-// private int udpPort;
-// private String udpIp;
-
-// private static SocketBoot updBoot;
private SocketBoot tcpBoot;
private ConnectStatusListener statusListener;
-
-// private EventListener searchEvent;
-// private CallBack searchCallBack;
-// private ScheduledExecutorService searchGatewayThread;
-// private final AtomicInteger searchCount = new AtomicInteger(0);
private HDLSocket() {
statusListener = new ConnectStatusListener() {
@@ -102,43 +76,6 @@
}
};
-// searchEvent = new EventListener() {
-// @Override
-// public void onMessage(Object msg) {
-// try {
-// if (msg instanceof LinkResponse) {
-// LinkResponse linkResponse = (LinkResponse) msg;
-// String data = linkResponse.getData();
-// if (!TextUtils.isEmpty(data)) {
-// final BaseLocalResponse<GatewaySearchBean> response = GsonConvert.getGson().fromJson(data, new TypeToken<BaseLocalResponse<GatewaySearchBean>>() {
-// }.getType());
-// GatewaySearchBean searchBean = response.getObjects();
-// if (searchBean != null) {
-//// gatewayId = searchBean.getGatewayId();
-//// if (!TextUtils.isEmpty(gatewayId)) {
-//// SPUtils.put(GATEWAY_KEY, gatewayId);
-//// }
-//// tcpIp = searchBean.getIp_address();
-//// if (!TextUtils.isEmpty(tcpIp)) {
-//// SPUtils.put(TCP_IP_KEY, tcpIp);
-//// }
-// }
-//
-// if (searchCallBack != null) {
-// searchCallBack.onResponse(linkResponse.toString());
-// }
-// }
-//
-// }
-// } catch (Exception e) {
-// if (searchCallBack != null) {
-// searchCallBack.onError("瑙ｆ瀽澶辫触");
-// }
-// }
-//
-//
-// }
-// };
}
private static class SingletonInstance {
@@ -149,16 +86,6 @@
return SingletonInstance.INSTANCE;
}
-
-// private SocketOptions getUdpOptions() {
-// final SocketOptions options = new SocketOptions();
-// final MessagePipeLine pipeLine = new MessagePipeLine();
-// pipeLine.add(new LinkMessageDecoder());
-// pipeLine.add(new LinkMessageEncoder());
-// options.setHandleMessage(pipeLine);
-// options.setEnabledHeartbeat(false);
-// return options;
-// }
private SocketOptions getTcpOptions() {
final SocketOptions options = new SocketOptions();
@@ -173,9 +100,6 @@
return options;
}
- private int getUdpPort() {
- return UDP_PORT;
- }
public int getTcpPort() {
return TCP_PORT;
@@ -188,90 +112,6 @@
public String getGatewayId() {
return HDLLinkConfig.getInstance().getGatewayId();
}
-
-
-// private String getUdpIp() {
-// if (TextUtils.isEmpty(udpIp)) {
-// udpIp = UDP_GROUP_IP;
-// }
-// return udpIp;
-// }
-
-// public void searchGateway() {
-// searchGateway(null);
-// }
-//
-// /**
-// * 缁勬挱鎼滅储
-// */
-// public void searchGateway(CallBack callBack) {
-//// gatewayId = "";//閲嶇疆缃戝叧ID
-//// this.searchCallBack = callBack;
-////
-//// if (searchGatewayThread != null) {
-//// searchGatewayThread.shutdownNow();
-//// }
-////
-////
-//// new Thread(new Runnable() {
-//// @Override
-//// public void run() {
-//// while (TextUtils.isEmpty(gatewayId)) {
-//// //鎼滅储缃戝叧
-//// searchGateway(IdUtils.getUUId(), searchEvent);
-//// try {
-//// Thread.sleep(1000L);
-//// } catch (InterruptedException e) {
-//// e.printStackTrace();
-//// }
-//// }
-//// }
-//// }).start();
-// }
-//
-//
-// /**
-// * 閫氳繃缁勬挱鎼滅储缃戝叧
-// */
-// public void searchGateway(String msgId, EventListener eventListener) {
-// searchGateway(getUdpIp(), getUdpPort(), msgId, eventListener);
-// }
-//
-// /**
-// * 閫氳繃骞挎挱鎼滅储缃戝叧
-// */
-// public void searchGatewayByBroadcast(String msgId, EventListener eventListener) {
-// searchGateway(IpUtils.getBroadcastAddress(), getUdpPort(), msgId, eventListener);
-// }
-//
-// /**
-// * 榛樿鏄粍鎾悳绱㈢綉鍏�
-// */
-// public void searchGateway(String ip, int port, String msgId, EventListener eventListener) {
-//
-// if (updBoot == null) {
-// updBoot = UdpClient.init(ip, port, getUdpOptions());
-// updBoot.connect();
-// }
-//
-//
-// String time = String.valueOf(System.currentTimeMillis());
-// JsonObject jsonObject = new JsonObject();
-// jsonObject.addProperty("id", msgId);
-// jsonObject.addProperty("time_stamp", time);
-//
-// EventDispatcher.getInstance().registerIo(TopicConstant.GATEWAY_SEARCH_REPLY, eventListener);
-// LinkRequest message = new LinkRequest(TopicConstant.GATEWAY_SEARCH,
-// jsonObject.toString());
-//
-// try {
-// updBoot.sendMsg(message.getSendBytes());
-// } catch (UnsupportedEncodingException e) {
-// e.printStackTrace();
-// }
-//
-// }
-
/**
* 鑾峰彇璁惧鍒楄〃
--
Gitblit v1.8.0