From bbc94746ac599fc61379d91f3981ac72dff5d202 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 11 二月 2022 09:56:02 +0800
Subject: [PATCH] 增加打印明文数据及系列化功能
---
HDLSDK_DEMO.zip | 0
HDLSDK.zip | 0
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java | 5 ++
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 2
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java | 4 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java | 73 ++++++++++++++++++++++++++++++++++++
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 2 +
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 21 +++++-----
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java | 2 +
HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar | 0
10 files changed, 95 insertions(+), 14 deletions(-)
diff --git a/HDLSDK.zip b/HDLSDK.zip
new file mode 100644
index 0000000..945fe33
--- /dev/null
+++ b/HDLSDK.zip
Binary files differ
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 0c7d606..7a6d0e9 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -276,15 +276,15 @@
tv.setText("寮�濮嬪叆缃戣璇�...");
//璁よ瘉鎻愪氦鍙傛暟鍑嗗
- //娴嬭瘯鏈嶅姟
- String spkStr = "ir.module";//浜у搧spk
- String macStr = "AA000000000000BB";//璁惧鍞竴MAC鍦板潃
- String secret = "87ae414b7a853f65";//閫氳繃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 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";//
@@ -309,13 +309,14 @@
infoBean.setDeviceModel("HDL");//
infoBean.setAccessMode("WIFI");
infoBean.setIPGateway("192.168.88.1");
- infoBean.setIPAddress(IpUtils.getIP(this));
+ infoBean.setIPAddress(IpUtils.getIP(this));//鏍规嵁鐪熷疄鐨処P鍦板潃濉啓
infoBean.setOID("010105000000FE08");
infoBean.setSid("010105000000FE08110100000000");
+ infoBean.setHw_version("1.0");
+ infoBean.setFw_version("1.0");
// infoBean.set
- AuthenticateRequest.VersionBean[] versionBeans = new AuthenticateRequest.VersionBean[]{new AuthenticateRequest.VersionBean("FW", versionString), new AuthenticateRequest.VersionBean("HW", "1956F")};
- infoBean.setVersions(versionBeans);
+
AuthenticateRequest request = new AuthenticateRequest(IdUtils.getUUId(), time, infoBean, authbean);
HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
@Override
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java
index 7b9b253..f3b663b 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java
@@ -4,6 +4,7 @@
import androidx.annotation.NonNull;
+import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.common.utils.ByteUtils;
import com.hdl.sdk.connect.utils.AesUtil;
@@ -87,6 +88,7 @@
String headString = "Topic:" + getTopic() + "\r\n" + "Length:" + dataBytes.length + "\r\n" + "\r\n";
byte[] headBytes = headString.getBytes("utf-8");
byte[] sendBytes = ByteUtils.concatBytes(headBytes, dataBytes);
+ LogUtils.i(headString + "\r\n" + data);
return sendBytes;
} else {
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
index 5dbec51..e7ba0f3 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/AuthenticateRequest.java
@@ -34,15 +34,45 @@
this.auth = auth;
}
+ /**
+ * 璁よ瘉淇℃伅
+ */
public static class AuthBean implements Serializable {
+ /**
+ * 璁惧MACKey
+ */
private String mac_key;//(mac+secret)鐨勪袱娆d5鍊�
+ /**
+ * 璁惧spk
+ */
private String spk;
+ /**
+ * 璇锋眰淇℃伅
+ */
private RequestBean request;//璁惧鐩稿叧淇℃伅
+ /**
+ * MAC key
+ * @return
+ */
public String getMACKey() { return mac_key; }
+
+ /**
+ * MACkey
+ * @param value
+ */
public void setMACKey(String value) { this.mac_key = value; }
+ /**
+ * SPK
+ * @return
+ */
public String getSpk() { return spk; }
+
+ /**
+ * SPK
+ * @param value
+ */
public void setSpk(String value) { this.spk = value; }
public RequestBean getRequest() { return request; }
@@ -51,6 +81,13 @@
public AuthBean() {
}
+
+ /**
+ * 璁よ瘉淇℃伅
+ * @param mac_key mac key
+ * @param spk 浜у搧spk
+ * @param request 璇锋眰瀵硅薄
+ */
public AuthBean(String mac_key, String spk, RequestBean request) {
this.mac_key = mac_key;
this.spk = spk;
@@ -71,16 +108,52 @@
this.firmware_version = firmware_version;
}
+ /**
+ * 璁惧MAC
+ * @return
+ */
public String getMAC() { return mac; }
+
+ /**
+ * 璁惧MAC
+ * @param value
+ */
public void setMAC(String value) { this.mac = value; }
+ /**
+ * 鍘傚
+ * @return
+ */
public String getSupplier() { return supplier; }
+
+ /**
+ * 鍘傚
+ * @param value
+ */
public void setSupplier(String value) { this.supplier = value; }
+ /**
+ * 纭欢鐗堟湰
+ * @return
+ */
public String getHardwareModel() { return hardware_model; }
+
+ /**
+ * 纭欢鐗堟湰
+ * @param value
+ */
public void setHardwareModel(String value) { this.hardware_model = value; }
+ /**
+ * 杞欢鐗堟湰
+ * @return
+ */
public String getFirmwareVersion() { return firmware_version; }
+
+ /**
+ * 杞欢鐗堟湰
+ * @param value
+ */
public void setFirmwareVersion(String value) { this.firmware_version = value; }
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java
index e26ebf4..0486f16 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/request/PropertyReadRequest.java
@@ -1,9 +1,12 @@
package com.hdl.sdk.connect.bean.request;
+import java.io.Serializable;
+
/**
* Created by Tong on 2021/10/8.
*/
-public class PropertyReadRequest {
+public class PropertyReadRequest implements Serializable
+{
private String sid;
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java
index 834c242..56fcc58 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java
@@ -112,7 +112,7 @@
}
@Override
- protected LinkResponse decoder(Object msg) throws Exception {
+ protected synchronized LinkResponse decoder(Object msg) throws Exception {
if (msg instanceof byte[]) {
bytes.addAll(ByteUtils.toByteList((byte[]) msg));
//濡傛灉澶氭潯鍛戒护鎵撳寘鍦ㄤ竴鏉℃暟鎹腑锛岄兘闇�瑕佸鐞嗗畬
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 e772421..dedba8a 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
@@ -1,6 +1,7 @@
package com.hdl.sdk.connect.socket;
import android.text.TextUtils;
+import android.util.Log;
import com.google.gson.JsonObject;
import com.hdl.sdk.common.config.TopicConstant;
@@ -406,6 +407,7 @@
public SocketBoot getTcp() throws RuntimeException {
if (TextUtils.isEmpty(getTcpIp())) {
+ LogUtils.e("璇锋悳绱㈢綉鍏�");
throw new RuntimeException("璇锋悳绱㈢綉鍏�");
}
//濡傛灉娌℃湁鍒濆鍖栵紝鎴栬�呯綉鍏矷P鏇存敼浜嗭紝灏遍噸鏂板垵濮嬪寲
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
index f1ae46d..fda635c 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/SocketBoot.java
@@ -81,8 +81,8 @@
while (true) {
try {
SocketRequest socketRequest = mMessageQueue.take();
- final String sendStr = new String(socketRequest.getData(), 0, socketRequest.getData().length);
- LogUtils.i("鍙戦�佹暟鎹細" + sendStr);
+// final String sendStr = new String(socketRequest.getData(), 0, socketRequest.getData().length);
+// LogUtils.i("鍙戦�佹暟鎹細" + sendStr);
final String action = socketRequest.getAction();
try {
client.sendMsg(socketRequest.getData());
diff --git a/HDLSDK_DEMO.zip b/HDLSDK_DEMO.zip
new file mode 100644
index 0000000..34cbc9d
--- /dev/null
+++ b/HDLSDK_DEMO.zip
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar b/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar
index 7918ad1..53d16c9 100644
--- a/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar
+++ b/HDLSDK_DEMO/app/libs/hdl-connect-V1.0.3.aar
Binary files differ
--
Gitblit v1.8.0