From 1b31fc28fb80025345246f93f10507a15412cc75 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 18 九月 2023 13:31:11 +0800
Subject: [PATCH] Merge branch 'androidx' of http://172.16.1.23:6688/r/~cjl/HDLSDK_A_Android into androidx
---
HDLSDK/.idea/gradle.xml | 2 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/protocol/LinkMessageDecoder.java | 3 ++-
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 13 +++++++------
HDLSDK/settings.gradle | 2 +-
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/HDLSDK/.idea/gradle.xml b/HDLSDK/.idea/gradle.xml
index 4502ab7..059ae1c 100644
--- a/HDLSDK/.idea/gradle.xml
+++ b/HDLSDK/.idea/gradle.xml
@@ -11,11 +11,11 @@
<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" />
</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 ffa64df..3d1386e 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -41,6 +41,7 @@
import com.hdl.sdk.connect.bean.request.ListSidRequest;
import com.hdl.sdk.connect.bean.request.ListUploadRequest;
import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
+import com.hdl.sdk.connect.bean.response.DeviceInfoResponse;
import com.hdl.sdk.connect.bean.response.GatewaySearchBean;
import com.hdl.sdk.connect.bean.response.UpdateInfo;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
@@ -71,12 +72,6 @@
private EventListener allTopicsListener;
private String testLightSid = "02010131D9C03D01020300010107";
private String secret = "";
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- removeAllTopicsListener();
- }
void applyDeviceSecret() {
tv.setText("寮�濮嬬敵璇疯澶囧瘑閽�...");
@@ -877,4 +872,10 @@
return versionName;
}
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ removeAllTopicsListener();
+ }
+
}
\ No newline at end of file
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 4c15135..e0f1a43 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
@@ -172,6 +172,7 @@
}
LinkResponse response = new LinkResponse();
response.setSource_ipAddress(ipaddress);
+ Log.d("panlili", "----->source_ipAddress= " + ipaddress);
response.setTopic(topic);
if (HDLLinkConfig.getInstance().ifNeedEncrypt(response.getTopic())) {
//闇�瑕佽В瀵�
@@ -196,7 +197,7 @@
String bodyString = new String(body, "utf-8");
response.setData(bodyString);
LogUtils.i("鎺ユ敹鍒版暟鎹�:" + response.getTopic() + "\r\n" + response.getData());
-
+
//闈炴甯告暟鎹紝杩斿洖
if (!((bodyString.startsWith("{") && bodyString.endsWith("}"))
|| (bodyString.startsWith("[") && bodyString.endsWith("]")))) {
diff --git a/HDLSDK/settings.gradle b/HDLSDK/settings.gradle
index b974e52..147d5db 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