From 699eb9ec4f272e02c06769ec8794b5608cb15627 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 二月 2022 17:20:00 +0800
Subject: [PATCH] 测试完善的版本
---
HDLSDK/hdl-common/build.gradle | 2 +-
HDLSDK/hdl-connect/build.gradle | 2 +-
HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java | 2 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | 8 ++++++++
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java | 15 +--------------
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java | 3 +--
HDLSDK/hdl-socket/src/main/java/com/hdl/sdk/socket/client/TcpClient.java | 2 +-
HDLSDK/hdl-socket/build.gradle | 2 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 12 +++++++-----
9 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/HDLSDK/hdl-common/build.gradle b/HDLSDK/hdl-common/build.gradle
index ae48686..1642da9 100644
--- a/HDLSDK/hdl-common/build.gradle
+++ b/HDLSDK/hdl-common/build.gradle
@@ -9,7 +9,7 @@
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode 2
- versionName "1.0.6"
+ versionName "1.0.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
diff --git a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java
index 3c11a89..e8ca45d 100644
--- a/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java
+++ b/HDLSDK/hdl-common/src/main/java/com/hdl/sdk/common/HDLSdk.java
@@ -19,7 +19,7 @@
return version;
}
- private String version="1.0.6";
+ private String version="1.0.7";
private HDLSdk() {
}
diff --git a/HDLSDK/hdl-connect/build.gradle b/HDLSDK/hdl-connect/build.gradle
index e9f6bea..30c83a1 100644
--- a/HDLSDK/hdl-connect/build.gradle
+++ b/HDLSDK/hdl-connect/build.gradle
@@ -9,7 +9,7 @@
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode 2
- versionName "1.0.6"
+ versionName "1.0.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
index debe128..4d344c5 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java
@@ -1,5 +1,6 @@
package com.hdl.sdk.connect;
+import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
@@ -11,6 +12,7 @@
import com.hdl.sdk.connect.socket.HDLSocket;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by jlchen on 11/15/21.
@@ -32,6 +34,12 @@
synchronized (HDLLink.class) {
if (instance == null) {
instance = new HDLLink();
+// ThreadToolUtils.getInstance().newScheduledThreadPool(1).scheduleWithFixedDelay(new Runnable() {
+// @Override
+// public void run() {
+////瀹氭湡鎼滅储缃戝叧锛屽悗闈㈢湅鏈夊繀瑕佸啀鍋�
+// }
+// },0,10, TimeUnit.SECONDS);
}
}
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
index 7988290..a21c26c 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/config/HDLLinkConfig.java
@@ -23,7 +23,6 @@
private String localSecret;//鏈湴鍔犲瘑瀵嗛挜
private String gatewayId;
private String ipAddress;
- private boolean isLocalEncrypt;//缃戝叧鏄惁闇�瑕佸姞瀵嗛�氳
private GatewaySearchBean currentGateway;//褰撳墠缃戝叧
private AuthenticateRequest.AuthenticateDeviceInfoBean deviceInfoBean;//褰撳墠璁惧鍩烘湰淇℃伅
@@ -57,7 +56,6 @@
this.gatewayId = "";
this.ipAddress = "";
this.localSecret = "";
- this.isLocalEncrypt = false;
SPUtils.remove(AUTHENTICATE_LS_KEY);
SPUtils.remove(AUTHENTICATE_GATEWAYID_KEY);
SPUtils.remove(AUTHENTICATE_IPADDRESS_KEY);
@@ -71,7 +69,6 @@
localSecret = SPUtils.getString(AUTHENTICATE_LS_KEY, "");
gatewayId = SPUtils.getString(AUTHENTICATE_GATEWAYID_KEY, "");
ipAddress = SPUtils.getString(AUTHENTICATE_IPADDRESS_KEY, "");
- isLocalEncrypt = SPUtils.getBoolean(AUTHENTICATE_IS_LS_KEY, false);
}
/**
@@ -115,7 +112,6 @@
}
public String getLocalSecret() {
- LogUtils.i("HDLLinkConfig","瀵嗛挜鏄�:"+localSecret);
return localSecret;
}
@@ -131,15 +127,6 @@
}
public void setIpAddress(String ipAddress){
this.ipAddress = ipAddress;
- }
-
- public boolean isLocalEncrypt() {
- return isLocalEncrypt;
- }
-
- public void setLocalEncrypt(boolean localEncrypt) {
- isLocalEncrypt = localEncrypt;
- SPUtils.put(AUTHENTICATE_IS_LS_KEY, isLocalEncrypt);
}
public GatewaySearchBean getCurrentGateway() {
@@ -169,7 +156,7 @@
&& !topicStr.contains(TopicConstant.DEIVCE_AUTH_REQUEST) //鍏ョ綉璁よ瘉
&& !topicStr.contains(TopicConstant.GATEWAY_SEARCH) //鎼滅储缃戝叧涓婚
&& !topicStr.contains(TopicConstant.BROADCAST)
- && isLocalEncrypt//鍚敤鍔犲瘑鏍囧織
+ && !TextUtils.isEmpty(localSecret) //鏈夊瘑閽ュ氨鏄姞瀵�
);
}
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 31e03b1..883e261 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
@@ -165,11 +165,13 @@
body = bodyBytes;
} else {
try {
- LogUtils.e("瑙ｅ瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n");
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
- LogUtils.e(Base64.getEncoder().encodeToString(body));
- else {
- LogUtils.e(new String(body, "utf-8"));
+ //涔嬪墠鐨勭増鏈繖鍧楁槸鏄庢枃鐨�
+ if (!topic.contains("heartbeat_reply")) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+ LogUtils.e("瑙ｅ瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + Base64.getEncoder().encodeToString(body));
+ else {
+ LogUtils.e("瑙ｅ瘑澶辫触锛屾暟鎹唴瀹规槸锛歕r\n" + new String(body, "utf-8"));
+ }
}
} catch (Exception e) {
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
index 908ed83..85c48bb 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLAuthSocket.java
@@ -229,6 +229,7 @@
});
}
+
// /**
// * 鍙戦�佸叆缃戝強璁よ瘉璇锋眰
// *
@@ -496,7 +497,6 @@
isSearchGatewaySuccess.set(true);//鎼滅储鎴愬姛鏍囪
searchGatewayCount.set(11);//娆℃暟鏍囪
HDLLinkConfig.getInstance().setCurrentGateway(searchBean);//璁剧疆褰撳墠缃戝叧
- HDLLinkConfig.getInstance().setLocalEncrypt(searchBean.isLocalEncrypt());//璁剧疆鏄惁鍔犲瘑
if (mSearchGatewayCallBack != null) {
mSearchGatewayCallBack.onSuccess(searchBean);
}
@@ -529,7 +529,6 @@
//涓荤綉鍏冲苟涓旀槸褰撳墠缁戝畾鐨勭綉鍏�
if ("true".equals(gateway.getMaster().toLowerCase()) && gateway.getGatewayId().equals(HDLLinkConfig.getInstance().getGatewayId())) {
HDLLinkConfig.getInstance().setCurrentGateway(gateway);//璁剧疆褰撳墠缃戝叧
- HDLLinkConfig.getInstance().setLocalEncrypt(gateway.isLocalEncrypt());//璁剧疆鏄惁鍔犲瘑
HDLLinkConfig.getInstance().setIpAddress(gateway.getIp_address());
//鏇存柊褰撳墠缃戝叧鐨勪俊鎭�
HDLLinkConfig.getInstance().reSaveConfig();
diff --git a/HDLSDK/hdl-socket/build.gradle b/HDLSDK/hdl-socket/build.gradle
index 60ad903..535b728 100644
--- a/HDLSDK/hdl-socket/build.gradle
+++ b/HDLSDK/hdl-socket/build.gradle
@@ -9,7 +9,7 @@
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
versionCode 2
- versionName "1.0.6"
+ versionName "1.0.7"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
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 9bc8781..5a62c9a 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
@@ -77,7 +77,7 @@
mSocket.setTcpNoDelay(true);
mSocket.setReuseAddress(true);
// mSocket.setKeepAlive(true);
- mSocket.setSoTimeout(20 * 1000);
+ mSocket.setSoTimeout(25 * 1000);
tcpClientList.add(this);
}
--
Gitblit v1.8.0