From 17ccf6615ce509c87c6b64ec63411a7acc14bbec Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 13 十二月 2021 11:56:24 +0800
Subject: [PATCH] 更改了密钥机制
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java | 47 ++++++++++-------------------------------------
1 files changed, 10 insertions(+), 37 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 29b1941..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
@@ -1,18 +1,12 @@
package com.hdl.sdk.connect.bean;
import android.text.TextUtils;
-import android.util.Log;
import androidx.annotation.NonNull;
-import com.hdl.sdk.common.config.AuthenticateConfig;
-import com.hdl.sdk.connect.utils.AESUtils;
+import com.hdl.sdk.connect.config.HDLLinkConfig;
+import com.hdl.sdk.common.utils.ByteUtils;
import com.hdl.sdk.connect.utils.AesUtil;
-
-import java.io.UnsupportedEncodingException;
-
-import static com.hdl.sdk.common.config.TopicConstant.DEIVCE_AUTH_REQUEST;
-import static com.hdl.sdk.common.config.TopicConstant.GATEWAY_SEARCH;
/**
* Created by Tong on 2021/9/29.
@@ -47,7 +41,6 @@
this.data = data;
if (!TextUtils.isEmpty(data)) {
setLength(getBytesLength(data));
-// setLength(data.length());
} else {
setLength(0);
}
@@ -74,32 +67,12 @@
getData();
}
- private static byte[] stringToBytes(String str) {
- try {
- // 浣跨敤鎸囧畾鐨勫瓧绗﹂泦灏嗘瀛楃涓茬紪鐮佷负byte搴忓垪骞跺瓨鍒颁竴涓猙yte鏁扮粍涓�
- return str.getBytes("utf-8");
- } catch (UnsupportedEncodingException e) {
- e.printStackTrace();
- }
- return new byte[]{};
+
+ private int getBytesLength(String str) {
+ return ByteUtils.stringToBytes(str).length;
}
- private int getBytesLength(String str){
- return stringToBytes(str).length;
- }
- /**
- * 鍚堝苟鏁扮粍
- * @param bt1
- * @param bt2
- * @return
- */
- public static byte[] byteMerger(byte[] bt1, byte[] bt2){
- byte[] bt3 = new byte[bt1.length + bt2.length];
- System.arraycopy(bt1, 0, bt3, 0, bt1.length);
- System.arraycopy(bt2, 0, bt3, bt1.length, bt2.length);
- return bt3;
- }
/**
* 鑾峰彇鍙戦�佹暟鎹産yte
*
@@ -108,14 +81,14 @@
public byte[] getSendBytes() {
try {
//鍒ゆ柇鏄惁闇�瑕佸姞瀵�
- if (AuthenticateConfig.getInstance().ifNeedEncrypt(topic)) {
+ if (HDLLinkConfig.getInstance().ifNeedEncrypt(topic)) {
//闇�瑕佸姞瀵�
- byte[] dataBytes = AesUtil.aesEncrypt(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[] headBytes = headString.getBytes();
- byte[] sendBytes = byteMerger(headBytes, dataBytes);
+ 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