From 8b66be08179b026cb0e601733dacd43de97e5b01 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 21 十二月 2021 10:20:34 +0800
Subject: [PATCH] 完善下网关上网重连功能及广播设备基本数据
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 235 ++++++++++++++--------------------------------------------
1 files changed, 58 insertions(+), 177 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 8e1c7d8..2048b61 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
@@ -3,40 +3,34 @@
import android.text.TextUtils;
import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
import com.hdl.sdk.common.config.TopicConstant;
import com.hdl.sdk.common.event.EventDispatcher;
import com.hdl.sdk.common.event.EventListener;
import com.hdl.sdk.common.exception.HDLLinkCode;
import com.hdl.sdk.common.exception.HDLLinkException;
import com.hdl.sdk.common.utils.IdUtils;
-import com.hdl.sdk.common.utils.IpUtils;
import com.hdl.sdk.common.utils.LogUtils;
-import com.hdl.sdk.common.utils.SPUtils;
import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.common.utils.gson.GsonConvert;
+import com.hdl.sdk.connect.bean.request.BroadcastRequest;
import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;
-import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
import com.hdl.sdk.connect.bean.LinkRequest;
import com.hdl.sdk.connect.bean.LinkResponse;
import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
-import com.hdl.sdk.connect.bean.request.PropertyUpRequest;
-import com.hdl.sdk.connect.callback.BaseCallBack;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
+import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.connect.protocol.LinkMessageDecoder;
import com.hdl.sdk.connect.protocol.LinkMessageEncoder;
import com.hdl.sdk.socket.SocketBoot;
import com.hdl.sdk.socket.SocketOptions;
import com.hdl.sdk.socket.client.TcpClient;
-import com.hdl.sdk.socket.client.UdpClient;
import com.hdl.sdk.socket.codec.MessagePipeLine;
import com.hdl.sdk.socket.listener.ConnectStatusListener;
import com.hdl.sdk.socket.listener.SendListener;
-import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
@@ -50,46 +44,20 @@
*/
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() {
@Override
public void onConnecting() {
-
+ broadcastRequest();
}
@Override
@@ -102,43 +70,29 @@
}
};
-// 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 void broadcastRequest() {
+ String time = String.valueOf(System.currentTimeMillis());
+ if (null == HDLLinkConfig.getInstance().getDeviceInfoBean()) {
+ LogUtils.i("DeviceInfoBean涓虹┖锛岃璁剧疆褰撳墠瀵硅薄");
+ return;
+ }
+ BroadcastRequest request = new BroadcastRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), "200");
+ HDLAuthSocket.getInstance().udpSendMsg("/user/all/custom/gateway/broadcast", GsonConvert.getGson().toJson(request), true, new HDLLinkResponseCallBack() {
+ @Override
+ public void onSuccess(LinkResponse msg) {
+ LogUtils.i("骞挎挱淇℃伅缁欎富缃戝叧鎴愬姛锛�");
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
}
private static class SingletonInstance {
@@ -149,30 +103,20 @@
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;
-// }
-
+ SocketOptions options;
private SocketOptions getTcpOptions() {
- final SocketOptions options = new SocketOptions();
+ if(null!=options){
+ return options;
+ }
+ options = new SocketOptions();
final MessagePipeLine pipeLine = new MessagePipeLine();
pipeLine.add(new LinkMessageDecoder());
pipeLine.add(new LinkMessageEncoder());
options.setHandleMessage(pipeLine);
- options.setEnabledHeartbeat(false);
+ options.addConnectStatusListener(statusListener);
return options;
}
- private int getUdpPort() {
- return UDP_PORT;
- }
public int getTcpPort() {
return TCP_PORT;
@@ -185,90 +129,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();
-// }
-//
-// }
-
/**
* 鑾峰彇璁惧鍒楄〃
@@ -546,9 +406,11 @@
if (TextUtils.isEmpty(getTcpIp())) {
throw new RuntimeException("璇锋悳绱㈢綉鍏�");
}
- if (tcpBoot == null) {
+ //濡傛灉娌℃湁鍒濆鍖栵紝鎴栬�呯綉鍏矷P鏇存敼浜嗭紝灏遍噸鏂板垵濮嬪寲
+ if (tcpBoot == null||!getTcpOptions().getIp().equals(getTcpIp())) {
tcpBoot = TcpClient.init(getTcpIp(), getTcpPort(), getTcpOptions());
}
+
return tcpBoot;
}
@@ -682,6 +544,24 @@
}
}
+ /**
+ * 閫氱敤TCP鍙戦�佹寚浠� 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�
+ *
+ * @param topic 鍙戦�佹暟鎹�
+ * @param bodyStr 鍥炲鐨勪富棰�
+ */
+ public void tcpSendMsg(String topic, String bodyStr) {
+ try {
+ if (TextUtils.isEmpty(topic) || TextUtils.isEmpty(bodyStr)) {
+ LogUtils.e("udpSendMsg", "鍙傛暟涓嶈兘涓虹┖");
+ return;
+ }
+ LinkRequest message = new LinkRequest(topic, bodyStr);
+ getTcp().sendMsg(message.getSendBytes());
+ } catch (Exception e) {
+ LogUtils.e("tcpSendMsg", "鍙戦�佸け璐� :"+e.getMessage());
+ }
+ }
/**
* 鍙戦�佹寚浠�
@@ -697,14 +577,14 @@
@Override
public void onMessage(Object msg) {
if (msg instanceof LinkResponse) {
- LogUtils.e("sendMsg onSuccess");
+ LogUtils.i("sendMsg onSuccess");
+ threadPool.shutdownNow();
+ LogUtils.i("sendMsg eventListener remove");
+ EventDispatcher.getInstance().remove(eventTag, this);
if (callBack != null) {
callBack.onSuccess(msg.toString());
}
- threadPool.shutdownNow();
}
- LogUtils.e("sendMsg eventListener remove");
- EventDispatcher.getInstance().remove(eventTag, this);
}
};
@@ -730,6 +610,7 @@
}
}, 1000, 500, TimeUnit.MILLISECONDS);
EventDispatcher.getInstance().register(eventTag, eventListener);
+ //鍏堝彂閫佷竴娆�
getTcp().sendMsg(data, new SendListener() {
@Override
public void onSucceed() {
--
Gitblit v1.8.0