From c84efd301bac95180aa3507a8a9a1c53068c8bb9 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 15 九月 2023 09:45:03 +0800
Subject: [PATCH] Merge branch 'androidx' of ssh://172.16.1.23:29718/~cjl/HDLSDK_A_Android into androidx
---
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/bean/LinkRequest.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 71f80bc..8184536 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,9 +1,10 @@
package com.hdl.sdk.connect.bean;
+
import android.text.TextUtils;
-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;
@@ -55,7 +56,6 @@
this.length = length;
}
- @NonNull
@Override
public String toString() {
return "Topic:" +
@@ -68,8 +68,7 @@
}
-
- private int getBytesLength(String str){
+ private int getBytesLength(String str) {
return ByteUtils.stringToBytes(str).length;
}
@@ -85,14 +84,16 @@
if (HDLLinkConfig.getInstance().ifNeedEncrypt(topic)) {
//闇�瑕佸姞瀵�
byte[] dataBytes = AesUtil.aesEncrypt(ByteUtils.stringToBytes(data), HDLLinkConfig.getInstance().getLocalSecret());
-// byte[] dataBytes = AESUtils.encryptAES(stringToBytes(data), AuthenticateConfig.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);
+ LogUtils.i("鍙戦�佹暟鎹細\r\n" + headString + "\r\n" + data);
return sendBytes;
+
} else {
- return this.toString().getBytes("utf-8");
+ String sendString = this.toString();
+ LogUtils.i("鍙戦�佹暟鎹細\r\n" + sendString);
+ return sendString.getBytes("utf-8");
}
} catch (Exception e) {
--
Gitblit v1.8.0