From 93f13e7b2e046c6d86d10e7abc2ecaa4c4adabc3 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 21 十二月 2021 11:47:38 +0800
Subject: [PATCH] 完善tcp
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
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 d3c9c7e..7b9b253 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,13 +4,9 @@
import androidx.annotation.NonNull;
-import com.hdl.sdk.common.config.AuthenticateConfig;
+import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.common.utils.ByteUtils;
-import com.hdl.sdk.connect.utils.AESUtils;
import com.hdl.sdk.connect.utils.AesUtil;
-
-import java.io.UnsupportedEncodingException;
-//import com.hdl.sdk.connect.utils.AesUtil;
/**
* Created by Tong on 2021/9/29.
@@ -72,8 +68,7 @@
}
-
- private int getBytesLength(String str){
+ private int getBytesLength(String str) {
return ByteUtils.stringToBytes(str).length;
}
@@ -86,15 +81,14 @@
public byte[] getSendBytes() {
try {
//鍒ゆ柇鏄惁闇�瑕佸姞瀵�
- if (AuthenticateConfig.getInstance().ifNeedEncrypt(topic)) {
+ if (HDLLinkConfig.getInstance().ifNeedEncrypt(topic)) {
//闇�瑕佸姞瀵�
- byte[] dataBytes = AesUtil.aesEncrypt(ByteUtils.stringToBytes(data), AuthenticateConfig.getInstance().getLocalSecret());
-// byte[] dataBytes = AESUtils.encryptAES(stringToBytes(data), AuthenticateConfig.getInstance().getLocalSecret());
-
+ byte[] dataBytes = AesUtil.aesEncrypt(ByteUtils.stringToBytes(data), HDLLinkConfig.getInstance().getLocalSecret());
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);
return sendBytes;
+
} else {
return this.toString().getBytes("utf-8");
}
--
Gitblit v1.8.0