From 1781ea87dbc71b48a2af5af907a2120d9596ab11 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期二, 07 十二月 2021 16:11:37 +0800
Subject: [PATCH] 第一个版本
---
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java | 17 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 239 +++++++++++++++++++++++++++++++++++++----------
2 files changed, 198 insertions(+), 58 deletions(-)
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 4cc8a8f..dc3afa8 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
@@ -1,6 +1,8 @@
package com.hdl.sdk.connect.protocol;
+import android.util.Log;
+
import com.hdl.sdk.common.utils.LogUtils;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.common.event.EventDispatcher;
@@ -22,77 +24,214 @@
private final List<Byte> bytes;
private final byte[] head = "Topic:".getBytes();
- private final byte[] body = "\r\n\r\n".getBytes();
+// private final byte[] body = "\r\n\r\n".getBytes();
public LinkMessageDecoder() {
this.bytes = new ArrayList<>();
}
+ /// <summary>
+ /// 鑾峰彇鍐呭闀垮害
+ /// </summary>
+ /// <param name="topMsgs"></param>
+ /// <returns></returns>
+ int getLenght(String[] topMsgs) {
+ for (int i = 0; i < topMsgs.length; i++) {
+ String topMsg = topMsgs[i].trim();
+ if (topMsg.startsWith("Length:")) {
+ return Integer.parseInt(topMsg.replace("Length:", ""));
+ }
+ }
+ //鎵句笉鍒伴暱搴�
+ return -1;
+ }
+
+ /// <summary>
+ /// 鑾峰彇涓婚
+ /// </summary>
+ /// <param name="topMsgs"></param>
+ /// <returns></returns>
+ private String getTopic(String[] topMsgs) {
+ for (int i = 0; i < topMsgs.length; i++) {
+ String topMsg = topMsgs[i].trim();
+ if (topMsg.startsWith("Topic:")) {
+ return topMsg.replace("Topic:", "");
+ }
+ }
+ //鎵句笉鍒颁富棰�
+ return null;
+ }
+
+ /**
+ * 鑾峰彇鏁版嵁鐨勫紑濮嬩綅缃�
+ *
+ * @param arrayList 鎺ユ敹鍒扮殑鎵�鏈夋暟鎹�
+ * @return 鏁版嵁浣嶇殑寮�濮嬬储寮�
+ */
+ int getDataIndex(List<Byte> arrayList) {
+ byte r = (byte) '\r';
+ byte n = (byte) '\n';
+ for (int i = 0; i < arrayList.size(); i++) {
+ //鎵惧嚭鏁版嵁鍐呭鍓嶉潰鐨勪袱涓崲琛�
+ if (3 <= i && arrayList.get(i - 3) == r && arrayList.get(i - 2) == n && arrayList.get(i - 1) == r && arrayList.get(i) == n) {
+ //鍓╀綑鐨勬暟鎹�
+ return i + 1;
+ }
+ }
+ return -1;
+ }
+
+ void initReceiveData(List<Byte> list) {
+
+ int index = 0;
+ boolean isMatch = false;
+ for (; index < list.size() - head.length; index++) {
+ isMatch = true;
+ for (int j = 0, k = 0; j < head.length; j++, k++) {
+ if (head[j] != list.get(index + k)) {
+ isMatch = false;
+ break;
+ }
+ }
+ if (isMatch) {
+ break;
+ }
+ }
+
+ if (0 < index && isMatch) {
+ List<Byte> tempList = new ArrayList<Byte>();
+ for (int i = index; i < list.size(); i++) {
+ tempList.add(list.get(index));
+ }
+
+ list.clear();
+ for(int i=0;i<tempList.size();i++){
+ list.add(tempList.get(i));
+ }
+ }
+ }
+
@Override
protected LinkResponse decoder(Object msg) throws Exception {
- LinkResponse response = new LinkResponse();
if (msg instanceof byte[]) {
- //瑙ｆ瀽娴�
- byte[] data = (byte[]) msg;
- bytes.addAll(ByteUtils.toByteList(data));
+ bytes.addAll(ByteUtils.toByteList((byte[]) msg));
+ //濡傛灉澶氭潯鍛戒护鎵撳寘鍦ㄤ竴鏉℃暟鎹腑锛岄兘闇�瑕佸鐞嗗畬
+ while (true) {
+ initReceiveData(bytes);
+ byte[] recevieBytes = ByteUtils.toByteArray(bytes);
+ String data = new String(recevieBytes);
- byte[] byteArray = ByteUtils.toByteArray(bytes);
- int headIndex = ByteUtils.getByteIndexOf(byteArray, head);
- if (headIndex > 0) {
- //绉诲姩鍒癶ead 寮�濮嬩綅缃�
- bytes.subList(0, headIndex).clear();
- byteArray = ByteUtils.toByteArray(bytes);
- }
+ String[] topMsgs = data.split("\r\n");
- int bodyIndex = ByteUtils.getByteIndexOf(byteArray, body);
- if (bodyIndex < 0) {
- //澶撮儴鏈幏鍙栧畬鎴�
- return null;
- }
- int bodyStartIndex = bodyIndex + body.length;
+ String topic = getTopic(topMsgs);
+ if (topic == null) {
+ break;
+ }
- //瑙ｆ瀽澶撮儴
- ProtocolParse parse = new ProtocolParse(byteArray);
- response.setTopic(parse.getTopic());
+ int lenght = getLenght(topMsgs);
- int bodyLength = parse.getLength();
- if (bodyLength > 0) {
- if (byteArray.length >= bodyLength + bodyStartIndex) {
- byte[] body = ByteUtils.getRangeBytes(bytes, bodyStartIndex, bodyStartIndex + bodyLength);
+ if (lenght <= 0) {
+ //澶撮儴鏁版嵁杩樻病鏈夋帴鏀跺畬鎴�
+ break;
+ }
+ //鏄惁宸茬粡鑾峰彇瀹屾暣鎵�鏈夌殑鏁版嵁
+ byte[] body = new byte[lenght];
+ int index = getDataIndex(bytes);
+ if (bytes.size() < index + lenght) {
+ //褰撳墠鏁版嵁杩樻病鏈夋帴鏀跺畬鎴�
+ break;
+ }
+ //澶嶅埗鍑篵ody鏁版嵁
+ System.arraycopy(recevieBytes, index, body, 0, body.length);
- if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) {
- //闇�瑕佽В瀵�
- byte[] bodyBytes = AesUtil.aesDecrypt(body, HDLLinkConfig.getInstance().getLocalSecret());
+ //淇濈暀鍓╀綑鐨勬暟鎹紝浠ユ鐢�
+ bytes.clear();
+ for (int i = index + lenght; i < recevieBytes.length; i++) {
+ bytes.add(recevieBytes[i]);
+ }
+ LinkResponse response = new LinkResponse();
+ response.setTopic(topic);
+ if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) {
+ //闇�瑕佽В瀵�
+ byte[] bodyBytes = AesUtil.aesDecrypt(body, HDLLinkConfig.getInstance().getLocalSecret());
// byte[] bodyBytes = AESUtils.decryptAES(body,AuthenticateConfig.getInstance().getLocalSecret());
- if (bodyBytes != null) {
- response.setData(new String(bodyBytes, "utf-8"));
+ if (bodyBytes != null) {
+ response.setData(new String(bodyBytes, "utf-8"));
// LogUtils.i("TAG", "瑙ｅ瘑 涓婚锛�"+response.getTopic()+ " body: "+response.getData());
- } else {
- //瑙ｅ瘑澶辫触锛岃繑鍥炲師鏁版嵁
- response.setData(new String(body, "utf-8"));
- LogUtils.e( "瑙ｅ瘑澶辫触");
- }
-
} else {
+ //瑙ｅ瘑澶辫触锛岃繑鍥炲師鏁版嵁
response.setData(new String(body, "utf-8"));
}
- if (byteArray.length >= bodyLength + bodyStartIndex) {
- //淇濆瓨浣欑暀
- byte[] remaining = ByteUtils.getRangeBytes(bytes, bodyStartIndex + bodyLength, byteArray.length);
- bytes.clear();
- for (byte b : remaining) {
- bytes.add(b);
- }
- }
- //瑙ｆ瀽瀹屾垚,topic鍙戦�佷竴娆�
- EventDispatcher.getInstance().post(response.getTopic(), response);
- return response;
+ } else {
+ response.setData(new String(body, "utf-8"));
}
- } else if (bodyLength == 0) {
- //body涓虹┖
- return response;
+ Log.i("TAG", "LinkMessageDecoder->decoder:" + response.getTopic() + "\r\n" + response.getData());
+ //瑙ｆ瀽瀹屾垚,topic鍙戦�佷竴娆�
+ EventDispatcher.getInstance().post(response.getTopic(), response);
}
+ return null;
+
+// //瑙ｆ瀽娴�
+// byte[] data = (byte[]) msg;
+// bytes.addAll(ByteUtils.toByteList(data));
+//
+// byte[] byteArray = ByteUtils.toByteArray(bytes);
+// int headIndex = ByteUtils.getByteIndexOf(byteArray, head);
+// if (headIndex > 0) {
+// //绉诲姩鍒癶ead 寮�濮嬩綅缃�
+// bytes.subList(0, headIndex).clear();
+// byteArray = ByteUtils.toByteArray(bytes);
+// }
+//
+// int bodyIndex = ByteUtils.getByteIndexOf(byteArray, body);
+// if (bodyIndex < 0) {
+// //澶撮儴鏈幏鍙栧畬鎴�
+// return null;
+// }
+// int bodyStartIndex = bodyIndex + body.length;
+//
+// //瑙ｆ瀽澶撮儴
+// ProtocolParse parse = new ProtocolParse(byteArray);
+// response.setTopic(parse.getTopic());
+//
+// int bodyLength = parse.getLength();
+// if (bodyLength > 0) {
+// if (byteArray.length >= bodyLength + bodyStartIndex) {
+// byte[] body = ByteUtils.getRangeBytes(bytes, bodyStartIndex, bodyStartIndex + bodyLength);
+//
+// if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) {
+// //闇�瑕佽В瀵�
+// byte[] bodyBytes = AesUtil.aesDecrypt(body, HDLLinkConfig.getInstance().getLocalSecret());
+//// byte[] bodyBytes = AESUtils.decryptAES(body,AuthenticateConfig.getInstance().getLocalSecret());
+// if (bodyBytes != null) {
+// response.setData(new String(bodyBytes, "utf-8"));
+//// LogUtils.i("TAG", "瑙ｅ瘑 涓婚锛�"+response.getTopic()+ " body: "+response.getData());
+// } else {
+// //瑙ｅ瘑澶辫触锛岃繑鍥炲師鏁版嵁
+// response.setData(new String(body, "utf-8"));
+// }
+//
+// } else {
+// response.setData(new String(body, "utf-8"));
+// }
+//
+// if (byteArray.length >= bodyLength + bodyStartIndex) {
+// //淇濆瓨浣欑暀
+// byte[] remaining = ByteUtils.getRangeBytes(bytes, bodyStartIndex + bodyLength, byteArray.length);
+// bytes.clear();
+// for (byte b : remaining) {
+// bytes.add(b);
+// }
+// }
+// //瑙ｆ瀽瀹屾垚,topic鍙戦�佷竴娆�
+// EventDispatcher.getInstance().post(response.getTopic(), response);
+// return response;
+// }
+// } else if (bodyLength == 0) {
+// //body涓虹┖
+// return response;
+// }
}
return null;
diff --git a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java
index 3cd750c..4e9d13c 100644
--- a/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java
+++ b/HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java
@@ -2,6 +2,7 @@
+import com.hdl.sdk.common.utils.ByteUtils;
import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.socket.SocketBoot;
import com.hdl.sdk.socket.SocketOptions;
@@ -14,7 +15,6 @@
import java.io.OutputStream;
import java.net.InetSocketAddress;
import java.net.Socket;
-import java.util.Arrays;
import java.util.List;
@@ -22,6 +22,7 @@
* Created by Tong on 2021/9/15.
*/
public final class TcpClient implements IClient {
+
private SocketOptions socketOptions;
@@ -87,15 +88,15 @@
@Override
public void onHandleResponse() throws Exception {
final InputStream stream = getInputStream();
-
if (stream != null && getOptions() != null) {
- readBuffer = new byte[1024];
- int len;
- while ((len = getInputStream().read(readBuffer)) != -1) {
+ int len=0;
+ while ( (len=getInputStream().read(readBuffer)) != -1) {
IHandleMessage handleMessage = getOptions().getHandleMessage();
- if (handleMessage != null && len > 0) {
- handleMessage.read(Arrays.copyOfRange(readBuffer, 0, len));
-// handleMessage.read(readBuffer);
+ if (handleMessage != null) {
+ byte []bytes = new byte[len];
+ System.arraycopy(readBuffer,0,bytes,0,len);
+ //瀹屾暣鐨勬暟鎹墠鍥炶皟
+ handleMessage.read(bytes);
}
}
}
--
Gitblit v1.8.0