From e7b8a808c2274e9c4329092bb752c7ea5cb035fc Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 13 十二月 2021 14:20:20 +0800
Subject: [PATCH] 2021-12-13 1.优化发送，和认证失败错误码处理
---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index 663df17..a175c06 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -37,6 +37,7 @@
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
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.socket.HDLAuthSocket;
import com.hdl.sdk.connect.socket.HDLSocket;
import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
@@ -246,9 +247,16 @@
tv.setText("寮�濮嬪叆缃戣璇�...");
//璁よ瘉鎻愪氦鍙傛暟鍑嗗
- String spkStr = "screen.mirror";//浜у搧spk
- String macStr = "AA000000000000AC";//璁惧鍞竴MAC鍦板潃
- String secret = "ee62124c151b737c";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+ //娴嬭瘯鏈嶅姟
+ String spkStr = "ir.module";//浜у搧spk
+ String macStr = "AA000000000000BB";//璁惧鍞竴MAC鍦板潃
+ String secret = "87ae414b7a853f65";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+
+ //姝ｅ紡鏈嶅姟鍣�
+// String spkStr = "screen.mirror";//浜у搧spk
+// String macStr = "AA000000000000AC";//璁惧鍞竴MAC鍦板潃
+// String secret = "ee62124c151b737c";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+
String mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
String time = String.valueOf(System.currentTimeMillis());
@@ -489,21 +497,39 @@
* TCP鍙戦�� 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�
*/
private void tcpSend() {
- String time = String.valueOf(System.currentTimeMillis());
- JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("id", IdUtils.getUUId());
- jsonObject.addProperty("time_stamp", time);
- HDLLink.getInstance().tcpSendMsg(TopicConstant.GATEWAY_SEARCH, jsonObject.toString());
+ String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
+ String bodyStr = getPropertyDownBodyStr();
+ HDLLink.getInstance().tcpSendMsg(propertyDownTopic, bodyStr);
}
/**
* 鍙彂涓�娆★紝涓嶇洃鍚洖澶嶏紝涓嶉噸鍙�
*/
private void udpSend() {
+ String propertyDownTopic = String.format(TopicConstant.PROPERTY_DOWN, HDLLinkConfig.getInstance().getGatewayId());
+ String bodyStr = getPropertyDownBodyStr();
+ HDLLink.getInstance().udpSendMsg(propertyDownTopic, bodyStr);
+ }
+
+ private String getPropertyDownBodyStr(){
+ isOn = !isOn;
+ List<DeviceControlRequest> requestList = new ArrayList<>();
+ DeviceControlRequest request = new DeviceControlRequest();
+ request.setSid(testLightSid);
+ List<DeviceControlRequest.StatusBean> statusBeanList= new ArrayList<>();
+ DeviceControlRequest.StatusBean bean = new DeviceControlRequest.StatusBean();
+ bean.setKey("on_off");
+ bean.setValue(isOn ? "on" : "off");
+ statusBeanList.add(bean);
+ request.setStatus(statusBeanList);
+ requestList.add(request);
String time = String.valueOf(System.currentTimeMillis());
- JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("id", IdUtils.getUUId());
- jsonObject.addProperty("time_stamp", time);
- HDLLink.getInstance().udpSendMsg(TopicConstant.GATEWAY_SEARCH, jsonObject.toString());
+
+ final BaseLocalResponse<List<DeviceControlRequest>> data = new BaseLocalResponse<>();
+ data.setId(IdUtils.getUUId());
+ data.setTime_stamp(time);
+ data.setObjects(requestList);
+
+ return GsonConvert.getGson().toJson(data);
}
}
\ No newline at end of file
--
Gitblit v1.8.0