From b1072a799774a18b19856d10c9ecfdda96a8b48d Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期五, 15 九月 2023 09:44:38 +0800
Subject: [PATCH] 代码同步
---
HDLSDK/.idea/gradle.xml | 1 -
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 12 ++++++------
HDLSDK/settings.gradle | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/HDLSDK/.idea/gradle.xml b/HDLSDK/.idea/gradle.xml
index c5f824a..92c877d 100644
--- a/HDLSDK/.idea/gradle.xml
+++ b/HDLSDK/.idea/gradle.xml
@@ -11,7 +11,6 @@
<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>
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 d8e4570..d650ead 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -73,12 +73,6 @@
private String testLightSid = "02010131D9C03D01020300010107";
private String secret = "";
- @Override
- protected void onDestroy() {
- super.onDestroy();
- removeAllTopicsListener();
- }
-
void applyDeviceSecret() {
tv.setText("寮�濮嬬敵璇疯澶囧瘑閽�...");
responseTv.setText("");
@@ -835,4 +829,10 @@
return versionName;
}
+ @Override
+ protected void onDestroy() {
+ super.onDestroy();
+ removeAllTopicsListener();
+ }
+
}
\ No newline at end of file
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