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 | 554 +++++++++++++++++++++++++++---------------------------
1 files changed, 277 insertions(+), 277 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 7c94a2f..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,34 +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.SPUtils;
+import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.common.utils.gson.GsonConvert;
-import com.hdl.sdk.connect.bean.BaseLocalResponse;
-import com.hdl.sdk.connect.bean.DeviceControlRequest;
-import com.hdl.sdk.connect.bean.FunctionAttributeRequest;
-import com.hdl.sdk.connect.bean.GatewaySearchBean;
+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.LinkRequest;
import com.hdl.sdk.connect.bean.LinkResponse;
-import com.hdl.sdk.connect.bean.PropertyReadRequest;
-import com.hdl.sdk.connect.bean.PropertyUpRequest;
+import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
+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;
@@ -44,54 +44,20 @@
*/
public class HDLSocket {
- private static final String GATEWAY_KEY = "gateway_key";
- private static final String TCP_IP_KEY = "tcp_ip_key";
- private String gatewayId;
-
- public interface CallBack {
-
- void onError(String error);
-
- 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
@@ -104,43 +70,29 @@
}
};
- searchEvent = new EventListener() {
+ }
+
+ /**
+ * 骞挎挱鑷韩淇℃伅缁欎富缃戝叧
+ */
+ 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 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);
- }
- }
+ public void onSuccess(LinkResponse msg) {
+ LogUtils.i("骞挎挱淇℃伅缁欎富缃戝叧鎴愬姛锛�");
+ }
- if (searchCallBack != null) {
- searchCallBack.onResponse(linkResponse.toString());
- }
- }
-
- }
- } catch (Exception e) {
- if (searchCallBack != null) {
- searchCallBack.onError("瑙ｆ瀽澶辫触");
- }
- }
-
+ @Override
+ public void onError(HDLLinkException e) {
}
- };
+ });
}
private static class SingletonInstance {
@@ -151,137 +103,37 @@
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;
}
public String getTcpIp() {
- if (!TextUtils.isEmpty(tcpIp)) {
- return tcpIp;
- }
- return SPUtils.getString(TCP_IP_KEY, "");
+ return HDLLinkConfig.getInstance().getIpAddress();
}
public String getGatewayId() {
- if (!TextUtils.isEmpty(gatewayId)) {
- return gatewayId;
- }
- return SPUtils.getString(GATEWAY_KEY, "");
+ 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.toString().getBytes("utf-8"));
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
-
- }
-
/**
* 鑾峰彇璁惧鍒楄〃
*/
- public void getDeviceList(CallBack callBack) {
+ public void getDeviceList(HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
JsonObject jsonObject = new JsonObject();
@@ -295,7 +147,7 @@
String replyTopic = String.format(TopicConstant.GET_DEVICE_LIST_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -304,18 +156,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鑾峰彇璁惧鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_DEVICE_LIST_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鑾峰彇璁惧鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_DEVICE_LIST_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("ip鍦板潃涓㈠け");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
}
}
}
@@ -324,7 +176,7 @@
/**
* 鑾峰彇鍔熻兘鍒楄〃
*/
- public void getFunctionList(CallBack callBack) {
+ public void getFunctionList(HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
JsonObject jsonObject = new JsonObject();
@@ -338,7 +190,7 @@
String replyTopic = String.format(TopicConstant.GET_FUNCTION_LIST_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -347,18 +199,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘鍒楄〃澶辫触");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("ip鍦板潃涓㈠け");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
}
}
}
@@ -367,10 +219,10 @@
/**
* 鑾峰彇鍔熻兘灞炴��
*
+ * @param sids
* @param callBack
- * @param sid
*/
- public void getFunctionAttribute(CallBack callBack, String... sid) {
+ public void getFunctionAttribute(List<String> sids, HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
@@ -378,7 +230,7 @@
data.setId(IdUtils.getUUId());
data.setTime_stamp(time);
List<FunctionAttributeRequest> list = new ArrayList<>();
- for (String s : sid) {
+ for (String s : sids) {
list.add(new FunctionAttributeRequest(s));
}
data.setObjects(list);
@@ -389,7 +241,7 @@
String replyTopic = String.format(TopicConstant.GET_FUNCTION_ATTRIBUTE_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -398,18 +250,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘灞炴�уけ璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_PROPERTIES_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鑾峰彇鍔熻兘灞炴�уけ璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_PROPERTIES_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("ip鍦板潃涓㈠け");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
}
}
}
@@ -417,7 +269,7 @@
/**
* 璁惧鎺у埗
*/
- public void propertyDown(List<DeviceControlRequest> request, CallBack callBack) {
+ public void propertyDown(List<DeviceControlRequest> request, HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
@@ -427,10 +279,9 @@
data.setTime_stamp(time);
data.setObjects(request);
-
String topic = String.format(TopicConstant.PROPERTY_DOWN, getGatewayId());
LinkRequest message = new LinkRequest(topic,
- GsonConvert.getGson().toJson(request));
+ GsonConvert.getGson().toJson(data));
String replyTopic = String.format(TopicConstant.PROPERTY_DOWN_REPLY, getGatewayId());
try {
@@ -443,87 +294,90 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鎺у埗鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
} catch (Exception e) {
if (callBack != null) {
- callBack.onError("鎺у埗鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("鎺у埗鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
}
- /**
- * 鐘舵�佷笂鎶�
- */
- public void propertyUp(List<PropertyUpRequest> request, CallBack callBack) {
- if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
- String time = String.valueOf(System.currentTimeMillis());
-
- final BaseLocalResponse<List<PropertyUpRequest>> data = new BaseLocalResponse<>();
- data.setId(IdUtils.getUUId());
- data.setTime_stamp(time);
- data.setObjects(request);
-
-
- String topic = String.format(TopicConstant.PROPERTY_UP, getGatewayId());
- LinkRequest message = new LinkRequest(topic,
- GsonConvert.getGson().toJson(request));
-
- String replyTopic = String.format(TopicConstant.PROPERTY_UP_REPLY, getGatewayId());
- try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
- @Override
- public void onSucceed() {
-
- }
-
- @Override
- public void onError() {
- if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
- }
- }
- });
- } catch (UnsupportedEncodingException e) {
- if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
- }
- }
- } else {
- if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
- }
- }
- }
+// /**
+// * 鐘舵�佷笂鎶�
+// */
+// public void propertyUp(List<PropertyUpRequest> request, CallBack callBack) {
+// if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+// String time = String.valueOf(System.currentTimeMillis());
+//
+// final BaseLocalResponse<List<PropertyUpRequest>> data = new BaseLocalResponse<>();
+// data.setId(IdUtils.getUUId());
+// data.setTime_stamp(time);
+// data.setObjects(request);
+//
+//
+// String topic = String.format(TopicConstant.PROPERTY_UP, getGatewayId());
+// LinkRequest message = new LinkRequest(topic,
+// GsonConvert.getGson().toJson(request));
+//
+// String replyTopic = String.format(TopicConstant.PROPERTY_UP_REPLY, getGatewayId());
+// try {
+// sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+// @Override
+// public void onSucceed() {
+//
+// }
+//
+// @Override
+// public void onError() {
+// if (callBack != null) {
+// callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+// }
+// }
+// });
+// } catch (Exception e) {
+// if (callBack != null) {
+// callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+// }
+// }
+// } else {
+// if (callBack != null) {
+// callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+// }
+// }
+// }
/**
* 璇诲彇鐘舵��
*/
- public void propertyRead(List<PropertyReadRequest> request, CallBack callBack) {
+ public void propertyRead(List<String> sids, HDLLinkCallBack callBack) {
if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
String time = String.valueOf(System.currentTimeMillis());
-
final BaseLocalResponse<List<PropertyReadRequest>> data = new BaseLocalResponse<>();
data.setId(IdUtils.getUUId());
data.setTime_stamp(time);
- data.setObjects(request);
+ List<PropertyReadRequest> list = new ArrayList<>();
+ for (String s : sids) {
+ list.add(new PropertyReadRequest(s));
+ }
+ data.setObjects(list);
String topic = String.format(TopicConstant.PROPERTY_READ, getGatewayId());
LinkRequest message = new LinkRequest(topic,
- GsonConvert.getGson().toJson(request));
+ GsonConvert.getGson().toJson(data));
String replyTopic = String.format(TopicConstant.PROPERTY_READ_REPLY, getGatewayId());
try {
- sendMsg(message.toString().getBytes("utf-8"), replyTopic, callBack, new SendListener() {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
@Override
public void onSucceed() {
@@ -532,18 +386,18 @@
@Override
public void onError() {
if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
- } catch (UnsupportedEncodingException e) {
+ } catch (Exception e) {
if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
} else {
if (callBack != null) {
- callBack.onError("鎸囦护鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
}
@@ -552,26 +406,168 @@
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;
}
/**
- * 娓呯┖缂撳瓨
+ * 鑾峰彇鍦烘櫙鍒楄〃
*/
- public void clearCache() {
- SPUtils.remove(TCP_IP_KEY);
- SPUtils.remove(GATEWAY_KEY);
+ public void getSceneList(HDLLinkCallBack callBack) {
+ if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+ String time = String.valueOf(System.currentTimeMillis());
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("id", IdUtils.getUUId());
+ jsonObject.addProperty("time_stamp", time);
+
+ String topic = String.format(TopicConstant.SCENE_LIST_GET, getGatewayId());
+
+ LinkRequest message = new LinkRequest(topic,
+ jsonObject.toString());
+ String replyTopic = topic + "_reply";
+ try {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+ @Override
+ public void onSucceed() {
+
+ }
+
+ @Override
+ public void onError() {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+ }
+ }
+ });
+ } catch (Exception e) {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_GET_FUNCTION_LIST_ERROR));
+ }
+ }
+ } else {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_UNAUTHORIZED_ERROR));
+ }
+ }
}
+ /**
+ * 鍦烘櫙鎺у埗
+ * @param sids 鍦烘櫙sid鍒楄〃
+ * @param callBack 鍥炶皟
+ */
+ public void controlScene(List<String> sids, HDLLinkCallBack callBack) {
+ if (!TextUtils.isEmpty(getGatewayId()) && !TextUtils.isEmpty(getTcpIp())) {
+ String time = String.valueOf(System.currentTimeMillis());
+ final BaseLocalResponse<List<PropertyReadRequest>> data = new BaseLocalResponse<>();
+ data.setId(IdUtils.getUUId());
+ data.setTime_stamp(time);
+
+ List<PropertyReadRequest> list = new ArrayList<>();
+ for (String s : sids) {
+ list.add(new PropertyReadRequest(s));
+ }
+ data.setObjects(list);
+
+ String topic = String.format(TopicConstant.SCENE_CONTROL, getGatewayId());
+ LinkRequest message = new LinkRequest(topic,
+ GsonConvert.getGson().toJson(data));
+
+ String replyTopic = topic + "_reply";
+ try {
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+ @Override
+ public void onSucceed() {
+
+ }
+
+ @Override
+ public void onError() {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ });
+ } catch (Exception e) {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ } else {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ }
+
+// /**
+// * 娓呯┖缂撳瓨
+// */
+// public void clearCache() {
+// SPUtils.remove(TCP_IP_KEY);
+// SPUtils.remove(GATEWAY_KEY);
+// }
+
+ /**
+ * 閫氱敤TCP鍙戦�佹寚浠�
+ * 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
+ *
+ * @param topic 鍙戦�佹暟鎹�
+ * @param bodyStr 鍥炲鐨勪富棰�
+ * @param callBack 鍥炶皟
+ */
+ public void tcpSendMsg(String topic, String bodyStr, HDLLinkCallBack callBack) {
+ try {
+ LinkRequest message = new LinkRequest(topic, bodyStr);
+ String replyTopic = topic + "_reply";
+ sendMsg(message.getSendBytes(), replyTopic, callBack, new SendListener() {
+ @Override
+ public void onSucceed() {
+
+ }
+
+ @Override
+ public void onError() {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ });
+ } catch (Exception e) {
+ if (callBack != null) {
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
+ }
+ }
+ }
+
+ /**
+ * 閫氱敤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());
+ }
+ }
/**
* 鍙戦�佹寚浠�
* 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
*/
- public void sendMsg(byte[] data, String eventTag, CallBack callBack, SendListener sendListener) {
+ public void sendMsg(byte[] data, String eventTag, HDLLinkCallBack callBack, SendListener sendListener) {
try {
final AtomicInteger sendCount = new AtomicInteger(0);
@@ -581,11 +577,13 @@
@Override
public void onMessage(Object msg) {
if (msg instanceof LinkResponse) {
-
- if (callBack != null) {
- callBack.onResponse(msg.toString());
- }
+ LogUtils.i("sendMsg onSuccess");
threadPool.shutdownNow();
+ LogUtils.i("sendMsg eventListener remove");
+ EventDispatcher.getInstance().remove(eventTag, this);
+ if (callBack != null) {
+ callBack.onSuccess(msg.toString());
+ }
}
}
};
@@ -598,12 +596,13 @@
getTcp().sendMsg(data);
} else {
threadPool.shutdownNow();
+ LogUtils.e("sendMsg eventListener remove");
EventDispatcher.getInstance().remove(eventTag, eventListener);
ThreadToolUtils.getInstance().runOnUiThread(new Runnable() {
@Override
public void run() {
if (callBack != null) {
- callBack.onError("鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
@@ -611,6 +610,7 @@
}
}, 1000, 500, TimeUnit.MILLISECONDS);
EventDispatcher.getInstance().register(eventTag, eventListener);
+ //鍏堝彂閫佷竴娆�
getTcp().sendMsg(data, new SendListener() {
@Override
public void onSucceed() {
@@ -632,7 +632,7 @@
@Override
public void run() {
if (callBack != null) {
- callBack.onError("鍙戦�佸け璐�");
+ callBack.onError(HDLLinkException.getErrorWithCode(HDLLinkCode.HDL_SEND_ERROR));
}
}
});
--
Gitblit v1.8.0