From b1569b789eef12cf5d4252620ca7e7d2d9c8b93a Mon Sep 17 00:00:00 2001
From: panlili2024 <14743743+panlili2024@user.noreply.gitee.com>
Date: 星期四, 14 十一月 2024 14:26:03 +0800
Subject: [PATCH] sdk重连优化
---
HDLSDK_DEMO/.idea/gradle.xml | 6 -
HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.9.aar | 0
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java | 33 ++++------
HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 25 +------
/dev/null | 0
HDLSDK/hdl-connect/build.gradle | 4
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HdlCloudApi.java | 4
HDLSDK/com.hdl.sdk/build.gradle | 4
HDLSDK_DEMO/.idea/compiler.xml | 2
HDLSDK_DEMO/app/build.gradle | 8 --
HDLSDK_DEMO/.idea/misc.xml | 38 ++++++------
HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java | 9 +-
HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java | 2
13 files changed, 53 insertions(+), 82 deletions(-)
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 a8e0116..94d2799 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -78,12 +78,12 @@
responseTv.setText("");
// //姝ｅ紡鏈嶅姟鍣�
- String appKey = "i8hR07jzrIS";//appkey
- String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret
+// String appKey = "i8hR07jzrIS";//appkey
+// String appSecret = "BmnJ8RWTtaVEBk24zPPF4UMwfYu0lAWU";//appsecret
//娴嬭瘯鏈嶅姟鍣�
-// String appKey ="FcRyUJlLJFF";
-// String appSecret = "wz8wn75ABidx8vXcFGUotqhwFkTaYvvJ";
+ String appKey ="FcRyUJlLJFF";
+ String appSecret = "wz8wn75ABidx8vXcFGUotqhwFkTaYvvJ";
// String appKey = "L2OZliZRxHc";
// String appSecret = "aCIWSvJDOukXfx3kivsKW11x9xdR3IbV";
@@ -481,6 +481,7 @@
void searchGatewayBroadcast() {
tv.setText("鎼滅储缃戝叧涓�...");
responseTv.setText("");
+ HDLLinkConfig.getInstance().getGatewayId();
HDLLink.getInstance().searchGatewayBroadcast(new HDLAuthSocket.SearchGatewayCallBack() {
@Override
public void onError(HDLLinkException e) {
diff --git a/HDLSDK/com.hdl.sdk/build.gradle b/HDLSDK/com.hdl.sdk/build.gradle
index 89dfde9..92656b8 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 118
- versionName "1.1.8"
+ versionCode 119
+ versionName "1.1.9"
}
buildTypes {
debug {
diff --git a/HDLSDK/hdl-connect/build.gradle b/HDLSDK/hdl-connect/build.gradle
index f32c003..44857b8 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 6
- versionName "1.1.8"
+ versionCode 7
+ versionName "1.1.9"
consumerProguardFiles "consumer-rules.pro"
}
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java
index 41b71e5..5ccb8bf 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/common/HDLSdk.java
@@ -35,7 +35,7 @@
public String getVersion() {
try {
PackageInfo packageInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
- String versionName = packageInfo.versionName; // 鐗堟湰鍚嶇О锛堝瓧绗︿覆锛�
+ String versionName = packageInfo.versionName; // 鐗堟湰鍚嶇О锛堝瓧绗︿覆锛�
return versionName;
} catch (Exception e) {
LogUtils.e("鑾峰彇鐗堟湰澶辫触:" + e.getMessage());
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HdlCloudApi.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HdlCloudApi.java
index 5f6256b..a32f225 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HdlCloudApi.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/cloud/HdlCloudApi.java
@@ -7,10 +7,10 @@
public class HdlCloudApi {
//姝ｅ紡鐜
- public static final String BASE_CHINA_URL = "https://china-gateway.hdlcontrol.com";
+// public static final String BASE_CHINA_URL = "https://china-gateway.hdlcontrol.com";
//娴嬭瘯鐜
-// public static final String BASE_CHINA_URL = "https://test-gz.hdlcontrol.com";
+ public static final String BASE_CHINA_URL = "https://test-gz.hdlcontrol.com";
//鐢宠璁惧瀵嗛挜(鏍规嵁璁惧MAC)
public static final String APPLY_DEVICE_SECRET = "/smart-open/third/device/authByMac";
diff --git a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
index 56a047d..57afa7b 100644
--- a/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
+++ b/HDLSDK/hdl-connect/src/main/java/com/hdl/sdk/connect/socket/HDLSocket.java
@@ -1,16 +1,12 @@
package com.hdl.sdk.connect.socket;
-import static com.hdl.sdk.connect.config.HDLLinkConfig.AUTHENTICATE_IS_DEVICEINFO_KEY;
-
import android.os.Build;
import android.text.TextUtils;
-import android.util.Log;
import androidx.annotation.RequiresApi;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
-import com.hdl.sdk.common.HDLSdk;
import com.hdl.sdk.common.config.TopicConstant;
import com.hdl.sdk.common.event.EventDispatcher;
import com.hdl.sdk.common.event.EventListener;
@@ -18,34 +14,29 @@
import com.hdl.sdk.common.exception.HDLLinkException;
import com.hdl.sdk.common.utils.IdUtils;
import com.hdl.sdk.common.utils.LogUtils;
-import com.hdl.sdk.common.utils.SPUtils;
import com.hdl.sdk.common.utils.ThreadToolUtils;
import com.hdl.sdk.common.utils.gson.GsonConvert;
import com.hdl.sdk.connect.HDLLink;
+import com.hdl.sdk.connect.bean.LinkRequest;
+import com.hdl.sdk.connect.bean.LinkResponse;
import com.hdl.sdk.connect.bean.LoginRequest;
-import com.hdl.sdk.connect.bean.request.AuthenticateRequest;
import com.hdl.sdk.connect.bean.request.BroadcastRequest;
import com.hdl.sdk.connect.bean.request.DeviceAuthRequest;
-import com.hdl.sdk.connect.bean.request.GatewayInfoRequest;
+import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;
import com.hdl.sdk.connect.bean.request.ListOidRequest;
import com.hdl.sdk.connect.bean.request.ListOidRequest2;
import com.hdl.sdk.connect.bean.request.ListSidRequest;
import com.hdl.sdk.connect.bean.request.ListUploadRequest;
-import com.hdl.sdk.connect.bean.response.AuthenticateResponse;
+import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
import com.hdl.sdk.connect.bean.response.BaseLocalCodeResponse;
import com.hdl.sdk.connect.bean.response.BaseLocalResponse;
-import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
-import com.hdl.sdk.connect.bean.request.FunctionAttributeRequest;
-import com.hdl.sdk.connect.bean.LinkRequest;
-import com.hdl.sdk.connect.bean.LinkResponse;
-import com.hdl.sdk.connect.bean.request.PropertyReadRequest;
import com.hdl.sdk.connect.bean.response.DeviceInfoResponse;
import com.hdl.sdk.connect.callback.HDLLinkCallBack;
import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
import com.hdl.sdk.connect.config.HDLLinkConfig;
import com.hdl.sdk.connect.protocol.LinkMessageDecoder;
import com.hdl.sdk.connect.protocol.LinkMessageEncoder;
-import com.hdl.sdk.connect.utils.AesUtil;
import com.hdl.sdk.socket.SocketBoot;
import com.hdl.sdk.socket.SocketOptions;
import com.hdl.sdk.socket.client.IHeartbeat;
@@ -55,7 +46,6 @@
import com.hdl.sdk.socket.listener.SendListener;
import java.util.ArrayList;
-import java.util.Base64;
import java.util.List;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
@@ -110,9 +100,12 @@
while (true) {
try {
Thread.sleep(5000);
-// LogUtils.i("checkIfCertified=" + HDLLink.getInstance().checkIfCertified() + " getTcp().connected=" + getTcp().connected);
try {
- if (!HDLLink.getInstance().checkIfCertified() || (!TextUtils.isEmpty(getTcpIp()) && getTcp().connected)) {
+ if (!HDLLink.getInstance().checkIfCertified()) {
+ continue;
+ }
+
+ if (!TextUtils.isEmpty(getTcpIp()) && getTcp().connected) {
continue;
}
} catch (Exception e) {
@@ -473,8 +466,8 @@
}
}
- public synchronized SocketBoot getTcp() throws RuntimeException {
- String gatewayIpAddress=getTcpIp();
+ public synchronized SocketBoot getTcp() throws RuntimeException {
+ String gatewayIpAddress = getTcpIp();
if (TextUtils.isEmpty(gatewayIpAddress)) {
LogUtils.e("璇锋悳绱㈢綉鍏�");
throw new RuntimeException("璇锋悳绱㈢綉鍏�");
@@ -664,7 +657,7 @@
data.setTime_stamp(time);
//2023.10.18淇敼锛屼笂鎶id鍒楄〃澧炲姞parentOid
- if (request!=null && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getParentOid())) {
+ if (request != null && !TextUtils.isEmpty(HDLLinkConfig.getInstance().getParentOid())) {
request.setParentOid(HDLLinkConfig.getInstance().getParentOid());
}
diff --git a/HDLSDK_DEMO/.idea/compiler.xml b/HDLSDK_DEMO/.idea/compiler.xml
index 7d7ec2e..245a82c 100644
--- a/HDLSDK_DEMO/.idea/compiler.xml
+++ b/HDLSDK_DEMO/.idea/compiler.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="11" />
+ <bytecodeTargetLevel target="1.8" />
</component>
</project>
\ No newline at end of file
diff --git a/HDLSDK_DEMO/.idea/gradle.xml b/HDLSDK_DEMO/.idea/gradle.xml
index 9885452..955aea3 100644
--- a/HDLSDK_DEMO/.idea/gradle.xml
+++ b/HDLSDK_DEMO/.idea/gradle.xml
@@ -4,10 +4,8 @@
<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="1.8" />
+ <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
@@ -17,7 +15,7 @@
<option value="$PROJECT_DIR$/hdl-socket" />
</set>
</option>
- <option name="resolveModulePerSourceSet" value="false" />
+ <option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings>
</option>
</component>
diff --git a/HDLSDK_DEMO/.idea/misc.xml b/HDLSDK_DEMO/.idea/misc.xml
index 1be33d1..84606c4 100644
--- a/HDLSDK_DEMO/.idea/misc.xml
+++ b/HDLSDK_DEMO/.idea/misc.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="DesignSurface">
- <option name="filePathToZoomLevelMap">
- <map>
- <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_devices_list.xml" value="0.3536458333333333" />
- <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_main.xml" value="0.3538301198540907" />
- <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/item_devices_list.xml" value="0.3536458333333333" />
- <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/activity_main.xml" value="0.1" />
- <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/demo_item.xml" value="0.28958333333333336" />
- </map>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/build/classes" />
- </component>
- <component name="ProjectType">
- <option name="id" value="Android" />
- </component>
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="DesignSurface">
+ <option name="filePathToZoomLevelMap">
+ <map>
+ <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_devices_list.xml" value="0.3536458333333333" />
+ <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/activity_main.xml" value="0.3538301198540907" />
+ <entry key="..\:/HDL/ProjectCode/HDLSDK/HDLSDK_A_Android/HDLSDK_DEMO/app/src/main/res/layout/item_devices_list.xml" value="0.3536458333333333" />
+ <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/activity_main.xml" value="0.1" />
+ <entry key="..\:/job/me/Android/HDLSDK/app/src/main/res/layout/demo_item.xml" value="0.28958333333333336" />
+ </map>
+ </option>
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="corretto-1.8" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/build/classes" />
+ </component>
+ <component name="ProjectType">
+ <option name="id" value="Android" />
+ </component>
</project>
\ No newline at end of file
diff --git a/HDLSDK_DEMO/app/build.gradle b/HDLSDK_DEMO/app/build.gradle
index 93ec83c..b15379f 100644
--- a/HDLSDK_DEMO/app/build.gradle
+++ b/HDLSDK_DEMO/app/build.gradle
@@ -38,12 +38,6 @@
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'
-<<<<<<< HEAD
- implementation 'com.google.code.gson:gson:2.8.8'
- implementation files('libs\\com.hdl.sdk-v1.0.16.aar')
-=======
// implementation 'com.google.code.gson:gson:2.8.8'
->>>>>>> not_androidx
-// implementation project(path: ':hdl-connect')
- implementation files('libs\\com.hdl.sdk-v1.1.3.aar')
+ implementation files('libs\\com.hdl.sdk-v1.1.9.aar')
}
\ No newline at end of file
diff --git a/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.16.aar b/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.16.aar
deleted file mode 100644
index 3e9f874..0000000
--- a/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.0.16.aar
+++ /dev/null
Binary files differ
diff --git a/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.3.aar b/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.9.aar
similarity index 94%
rename from HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.3.aar
rename to HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.9.aar
index 457d626..51bd25c 100644
--- a/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.3.aar
+++ b/HDLSDK_DEMO/app/libs/com.hdl.sdk-v1.1.9.aar
Binary files differ
diff --git a/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java b/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
index bc5e1a0..20780bf 100644
--- a/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK_DEMO/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -52,6 +52,8 @@
import java.util.List;
import java.util.Map;
+import retrofit2.http.HEAD;
+
public class MainActivity extends AppCompatActivity {
private static final String TAG = "MainActivity";
@@ -74,32 +76,21 @@
void initDeviceInfo() {
AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
-<<<<<<< HEAD
- infoBean.setDeviceMAC("AA00000000000100");
- infoBean.setIPMAC("AA00000000000100");
-=======
+
infoBean.setDeviceMAC("f2c5d8bad48f");
infoBean.setIPMAC("f2c5d8bad48f");
->>>>>>> not_androidx
+
infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧
infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
infoBean.setAccessMode("WIFI");
infoBean.setIPGateway("192.168.1.1");
-<<<<<<< HEAD
- infoBean.setIPAddress("192.168.1.116");
- infoBean.setGateway_type("music.standard");
-=======
infoBean.setIPAddress("192.168.1.103");
infoBean.setGateway_type("screen.touch");
->>>>>>> not_androidx
infoBean.setHw_version("HW2.0");
infoBean.setFw_version("Fw1.0");
infoBean.setOID("010105000000FE11");//姣忎釜璁惧oid閮借涓嶄竴鏍�
infoBean.setSid("110105000000FE08110100000011");//姣忎釜璁惧鐨剆id閮借涓嶄竴鏍�
-<<<<<<< HEAD
-=======
infoBean.setSupplier("JINMAOYUN");
->>>>>>> not_androidx
HDLLinkConfig.getInstance().setDeviceInfoBean(infoBean);
}
@@ -159,16 +150,10 @@
// String secret = "44b360eb74b7ba64";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
// 姝ｅ紡鏈嶅姟鍣�
-<<<<<<< HEAD
- String spkStr = "screen.mirror";//浜у搧spk
- String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
- String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
-=======
String spkStr = "screen.touch";//浜у搧spk
// String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
String macStr = editText.getText().toString();//璁惧鍞竴MAC鍦板潃
-// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
->>>>>>> not_androidx
+// String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑
String mac_key = stringToMD5(stringToMD5(macStr + secret));
String versionString = "HDL_V1.0.1";//
--
Gitblit v1.8.0