From 6d908915d558ec457db8a50b03ed8746f4e73a48 Mon Sep 17 00:00:00 2001
From: 562935844@qq.com <562935844@qq.com>
Date: 星期五, 28 六月 2024 14:53:35 +0800
Subject: [PATCH] 代码优化
---
HDLSDK/hdl-connect/build.gradle | 4 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/client/UdpClient.java | 33 ++++++++--------
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java | 1
HDLSDK/com.hdl.sdk/build.gradle | 4 +-
HDLSDK/.idea/gradle.xml | 7 +--
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 16 ++++---
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 10 +++--
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/udp/UdpSocketBoot.java | 38 ++++++++++--------
HDLSDK/settings.gradle | 2
9 files changed, 62 insertions(+), 53 deletions(-)
diff --git a/HDLSDK/.idea/gradle.xml b/HDLSDK/.idea/gradle.xml
index 059ae1c..d07087b 100644
--- a/HDLSDK/.idea/gradle.xml
+++ b/HDLSDK/.idea/gradle.xml
@@ -4,18 +4,17 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
- <option name="testRunner" value="GRADLE" />
- <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="Embedded JDK" />
+ <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/app" />
<option value="$PROJECT_DIR$/com.hdl.sdk" />
<option value="$PROJECT_DIR$/hdl-connect" />
</set>
</option>
- <option name="resolveModulePerSourceSet" value="false" />
+ <option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
diff --git a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index 16d97f1..a8e0116 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -330,8 +330,10 @@
@Override
public void onMessage(Object msg) {
LinkResponse response = (LinkResponse) msg;
+ Log.i("onMessage", "response.getTopic():" + response.getTopic());
if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())) {
localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
+
}
}
};
@@ -381,8 +383,7 @@
HDLLink.getInstance().removeAllTopicsListener(allTopicsListener);
}
- void initDeviceInfo()
- {
+ void initDeviceInfo() {
AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
infoBean.setDeviceMAC("f2c5d8bad48f");
infoBean.setIPMAC("f2c5d8bad48f");
@@ -390,7 +391,7 @@
infoBean.setDeviceModel("HDLSDK");//璁惧鍨嬪彿
infoBean.setAccessMode("WIFI");
infoBean.setIPGateway("192.168.1.1");
- infoBean.setIPAddress("192.168.1.116");
+ infoBean.setIPAddress("192.168.1.103");
infoBean.setGateway_type("screen.touch");
infoBean.setHw_version("HW2.0");
infoBean.setFw_version("Fw1.0");
@@ -580,6 +581,7 @@
statusBeanList.add(bean);
request.setStatus(statusBeanList);
requestList.add(request);
+
HDLLink.getInstance().propertyDown(requestList, new HDLLinkCallBack() {
@Override
public void onSuccess(String data) {
@@ -830,7 +832,7 @@
AttributesRequest attributes = new AttributesRequest();
attributes.setKey("on_off");
attributes.setData_type("string");
- List<Object> valueList=new ArrayList<>();
+ List<Object> valueList = new ArrayList<>();
valueList.add("on");
valueList.add("off");
attributes.setValue(valueList);
diff --git a/HDLSDK/com.hdl.sdk/build.gradle b/HDLSDK/com.hdl.sdk/build.gradle
index 46ae1ff..89dfde9 100644
--- a/HDLSDK/com.hdl.sdk/build.gradle
+++ b/HDLSDK/com.hdl.sdk/build.gradle
@@ -8,8 +8,8 @@
defaultConfig {
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
- versionCode 117
- versionName "1.1.7"
+ versionCode 118
+ versionName "1.1.8"
}
buildTypes {
debug {
diff --git a/HDLSDK/hdl-connect/build.gradle b/HDLSDK/hdl-connect/build.gradle
index 5f8c118..f32c003 100644
--- a/HDLSDK/hdl-connect/build.gradle
+++ b/HDLSDK/hdl-connect/build.gradle
@@ -8,8 +8,8 @@
defaultConfig {
minSdkVersion rootProject.minSdkVersion
targetSdkVersion rootProject.targetSdkVersion
- versionCode 5
- versionName "1.1.3"
+ versionCode 6
+ versionName "1.1.8"
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 085df44..8e9851e 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
@@ -157,6 +157,7 @@
*/
public void UploadDeviceAuth(String mac, String result, String message, String auth_code, HDLLinkCallBack callBack) {
HDLSocket.getInstance().UploadDeviceAuth(mac, result, message, auth_code, callBack);
+
}
/**
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 243d81e..1cf5c5c 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
@@ -314,13 +314,15 @@
if (encrypt(body)) {
//闇�瑕佽В瀵�
- byte[] bodyBytes = AesUtil.aesDecrypt(body, HDLLinkConfig.getInstance().getLocalSecret());
- if (bodyBytes != null) {
- response.setData(new String(bodyBytes, StandardCharsets.UTF_8));
- } else {
- LogUtils.e("瑙ｅ瘑澶辫触\r\n" + topic);
- response.setData(new String(body, "utf-8"));
- continue;
+ if (!TextUtils.isEmpty(HDLLinkConfig.getInstance().getLocalSecret())) {
+ byte[] bodyBytes = AesUtil.aesDecrypt(body, HDLLinkConfig.getInstance().getLocalSecret());
+ if (bodyBytes != null) {
+ response.setData(new String(bodyBytes, StandardCharsets.UTF_8));
+ } else {
+ LogUtils.e("瑙ｅ瘑澶辫触\r\n" + topic);
+ response.setData(new String(body, "utf-8"));
+ continue;
+ }
}
} else {
response.setData(new String(body, "utf-8"));
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/client/UdpClient.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
index c6a3aff..c8d46ea 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/client/UdpClient.java
@@ -5,20 +5,16 @@
import com.hdl.sdk.common.utils.IpUtils;
import com.hdl.sdk.common.utils.LogUtils;
-import com.hdl.sdk.socket.SocketBoot;
-import com.hdl.sdk.socket.SocketOptions;
import com.hdl.sdk.socket.SocketPool;
+import com.hdl.sdk.socket.codec.IHandleMessage;
import com.hdl.sdk.socket.udp.UdpSocketBoot;
import com.hdl.sdk.socket.udp.UdpSocketOptions;
-import com.hdl.sdk.socket.codec.IHandleMessage;
import java.io.IOException;
import java.net.DatagramPacket;
import java.net.DatagramSocket;
import java.net.InetAddress;
import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
@@ -29,7 +25,7 @@
/**
* 褰撳墠socket
*/
- private DatagramSocket mSocket;
+ private DatagramSocket mSocket;
/**
* 鎺ユ敹鏁版嵁鍖�
@@ -57,11 +53,12 @@
/**
* 鍒濆鍖栧弬鏁�
- * @param ipAddress 鏈湴鐩戝惉绔彛
- * @param port 鏈湴鐩戝惉绔彛
+ *
+ * @param ipAddress 鏈湴鐩戝惉绔彛
+ * @param port 鏈湴鐩戝惉绔彛
* @param socketOptions
*/
- private UdpClient(String ipAddress,int port, UdpSocketOptions socketOptions) {
+ private UdpClient(String ipAddress, int port, UdpSocketOptions socketOptions) {
this.ipAddress = ipAddress;
this.port = port;
this.socketOptions = socketOptions;
@@ -71,8 +68,9 @@
/**
* 鍒濆鍖栧弬鏁�
+ *
* @param ipAddress 鏈湴鐩戝惉IP鍦板潃
- * @param port 鏈湴鐩戝惉绔彛
+ * @param port 鏈湴鐩戝惉绔彛
* @param options
* @return
*/
@@ -82,7 +80,8 @@
/**
* 鍒濆鍖栧弬鏁�
- * @param port 鏈湴鐩戝惉绔彛
+ *
+ * @param port 鏈湴鐩戝惉绔彛
* @param options
* @return
*/
@@ -100,8 +99,8 @@
}
if (TextUtils.isEmpty(ipAddress)) {
mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(port));
- }else {
- mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(ipAddress,port));
+ } else {
+ mSocket = SocketPool.getInstance().getUdpSocket(new InetSocketAddress(ipAddress, port));
}
mSocket.setBroadcast(true);
// mSocket.setReuseAddress(true);
@@ -156,7 +155,7 @@
if (handleMessage != null) {
byte[] data = new byte[receivePacket.getLength()];
System.arraycopy(receivePacket.getData(), 0, data, 0, data.length);
- handleMessage.read(data,receivePacket.getAddress().getHostAddress());
+ handleMessage.read(data, receivePacket.getAddress().getHostAddress());
}
} catch (Exception e) {
@@ -166,11 +165,13 @@
@Override
- public void sendMsg(String ipAddress,int port, byte[] msg) throws Exception {
+ public void sendMsg(String ipAddress, int port, byte[] msg) throws Exception {
if (msg == null) {
return;
}
final DatagramPacket sendPacket = new DatagramPacket(msg, msg.length, InetAddress.getByName(ipAddress), port);
- mSocket.send(sendPacket);
+ if (mSocket != null && sendPacket != null) {
+ mSocket.send(sendPacket);
+ }
}
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/udp/UdpSocketBoot.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/udp/UdpSocketBoot.java
index be4e1a4..0c088f0 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/udp/UdpSocketBoot.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/socket/udp/UdpSocketBoot.java
@@ -35,6 +35,7 @@
/**
* 缁戝畾 socket
+ *
* @throws Exception 鍙兘绔彛鍐茬獊
*/
public void bind() throws Exception {
@@ -46,7 +47,7 @@
* 鍒濆鍖栨帴鏀剁嚎绋�
*/
private void initReceiveThread() {
- if(null!=receiveThread){
+ if (null != receiveThread) {
return;
}
receiveThread = ThreadToolUtils.getInstance().newFixedThreadPool(1);
@@ -57,7 +58,7 @@
try {
client.onHandleResponse();
} catch (Exception e) {
- LogUtils.i("鎺ユ敹绾跨▼寮傚父锛�"+e.getMessage());
+ LogUtils.i("鎺ユ敹绾跨▼寮傚父锛�" + e.getMessage());
}
}
}
@@ -67,34 +68,37 @@
/**
* 鍙戦�佹暟鎹�
+ *
* @param ipAddress 鐩殑鐨処P鍦板潃
- * @param port 绔彛
- * @param msg 鍙戦�佹暟鎹�
- * @param listener 鍙戦�佸洖璋�
+ * @param port 绔彛
+ * @param msg 鍙戦�佹暟鎹�
+ * @param listener 鍙戦�佸洖璋�
*/
- public void sendMsg(String ipAddress,int port,byte[] msg, SendListener listener) {
- sendMsg(ipAddress,port, msg, true, listener);
+ public void sendMsg(String ipAddress, int port, byte[] msg, SendListener listener) {
+ sendMsg(ipAddress, port, msg, true, listener);
}
/**
* 鍙戦�佹暟鎹�
+ *
* @param ipAddress 鐩殑鐨処P鍦板潃
- * @param port 绔彛
- * @param msg 鍙戦�佹暟鎹�
+ * @param port 绔彛
+ * @param msg 鍙戦�佹暟鎹�
*/
- public void sendMsg(String ipAddress,int port,byte[] msg) {
- sendMsg(ipAddress,port, msg, true, null);
+ public void sendMsg(String ipAddress, int port, byte[] msg) {
+ sendMsg(ipAddress, port, msg, true, null);
}
/**
* 鍙戦�佹暟鎹�
- * @param ipAddress 鐩殑IP鍦板潃
- * @param port 绔彛
- * @param msg 鍙戦�佺殑鏁版嵁
+ *
+ * @param ipAddress 鐩殑IP鍦板潃
+ * @param port 绔彛
+ * @param msg 鍙戦�佺殑鏁版嵁
* @param isRefreshRetry 鏄惁瑕侀噸鍙�
- * @param listener 鍙戦�佸洖璋�
+ * @param listener 鍙戦�佸洖璋�
*/
- public void sendMsg(String ipAddress,int port, byte[] msg, boolean isRefreshRetry, SendListener listener) {
+ public void sendMsg(String ipAddress, int port, byte[] msg, boolean isRefreshRetry, SendListener listener) {
if (isRefreshRetry) {
//閲嶇疆杩炴帴娆℃暟
resendCount.set(0);
@@ -118,7 +122,7 @@
isOpenRetry.set(false);
sendMap.clear();
receiveThread.shutdown();
- receiveThread=null;
+ receiveThread = null;
client.close();
}
}
diff --git a/HDLSDK/settings.gradle b/HDLSDK/settings.gradle
index 147d5db..b974e52 100644
--- a/HDLSDK/settings.gradle
+++ b/HDLSDK/settings.gradle
@@ -1,5 +1,5 @@
-//include ':app'
+include ':app'
//include ':hdl-socket'
include ':hdl-connect'
//include ':hdl-common'
--
Gitblit v1.8.0