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/hdl-connect/src/main/java/com/hdl/sdk/connect/HDLLink.java |   66 +++++++++++++++++++++++++++++++++
 1 files changed, 66 insertions(+), 0 deletions(-)

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 e84727d..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
@@ -3,14 +3,17 @@
 import android.content.Context;
 
 import com.hdl.hdlhttp.HxHttpConfig;
+import com.hdl.sdk.common.event.DeleteNetworkListener;
 import com.hdl.sdk.common.utils.LogUtils;
 import com.hdl.sdk.common.utils.ThreadToolUtils;
 import com.hdl.sdk.connect.bean.request.DeviceAuthRequest;
 import com.hdl.sdk.connect.bean.request.DeviceControlRequest;
+import com.hdl.sdk.connect.bean.request.ListSidRequest;
 import com.hdl.sdk.connect.bean.request.ListUploadRequest;
 import com.hdl.sdk.connect.callback.HDLLinkCallBack;
 import com.hdl.sdk.connect.callback.HDLLinkResponseCallBack;
 import com.hdl.sdk.connect.cloud.CallBackListener;
+import com.hdl.sdk.connect.cloud.CheckAppVersionListener;
 import com.hdl.sdk.connect.cloud.HdlCloudApi;
 import com.hdl.sdk.connect.cloud.HdlCloudController;
 import com.hdl.sdk.connect.cloud.interceptor.EncryptInterceptor;
@@ -40,6 +43,7 @@
     private static final HDLLink instance = new HDLLink();
 
     private String appKey, appSecret;
+    public DeleteNetworkListener listener;
 
     /**
      * getInstance
@@ -92,6 +96,15 @@
         EventDispatcher.getInstance().removeAllTopicsListener(listener);
     }
 
+    /**
+     * 娉ㄥ唽閫�缃戜富棰樼殑鐩戝惉
+     *
+     * @param listener
+     */
+    public synchronized void setDeleteNetworkListener(DeleteNetworkListener listener) {
+        this.listener = listener;
+    }
+
     /***********************涓夋柟璁惧鍜岀綉鍏抽�氫俊涔嬪墠鐨勮璇佹祦绋�****************************/
     /**
      * 妫�娴嬫槸鍚﹀凡缁忚璇佽繃
@@ -105,6 +118,10 @@
 
     public void selectNetwork(String networkName) {
         HDLLinkConfig.getInstance().setNetworkName(networkName);
+    }
+
+    public String getParentOid() {
+        return HDLLinkConfig.getInstance().getParentOid();
     }
 
     /**
@@ -140,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);
+
     }
 
     /**
@@ -167,6 +185,34 @@
                 .addInterceptor(httpLoggingInterceptor).ignoreSSL();
 
         HdlCloudController.applyDeviceSecret(supplier, mac, spk, callBack);
+    }
+
+    /**
+     * 妫�娴嬫洿鏂�
+     *
+     * @param appKey      appKey
+     * @param appSecret   appSecret
+     * @param versionCode 褰撳墠鐗堟湰
+     * @param appCode     appCode
+     * @param listener    缁撴灉鍥炶皟
+     */
+    public void checkAppVersion(Context context, String appKey, String appSecret, String versionCode, String appCode, CheckAppVersionListener listener) {
+        LogUtils.i("妫�娴嬫洿鏂�");
+        HxHttpConfig.getInstance().init(context, HdlCloudApi.BASE_CHINA_URL)
+                .addInterceptor(
+                        new EncryptInterceptor(),
+                        new SmartHeaderInterceptor());
+        this.appKey = appKey;
+        this.appSecret = appSecret;
+
+        HttpLoggingInterceptor httpLoggingInterceptor = new HttpLoggingInterceptor();
+        httpLoggingInterceptor.level(HttpLoggingInterceptor.Level.BODY);
+
+        HxHttpConfig.getInstance()
+                //.addInterceptor(new HttpCacheInterceptor())
+                .addInterceptor(httpLoggingInterceptor).ignoreSSL();
+
+        HdlCloudController.checkAppVersion(versionCode, appCode, listener);
     }
 
     /**
@@ -251,6 +297,16 @@
     }
 
     /**
+     * 鍦烘櫙璇︽儏
+     *
+     * @param sids     鍦烘櫙sid鍒楄〃
+     * @param callBack 鍥炶皟
+     */
+    public void getScene(List<String> sids, HDLLinkCallBack callBack) {
+        HDLSocket.getInstance().getScene(sids, callBack);
+    }
+
+    /**
      * 鍦烘櫙鎺у埗
      *
      * @param sids     鍦烘櫙sid鍒楄〃
@@ -271,6 +327,16 @@
     }
 
     /**
+     * 涓婃姤sid鍒楄〃
+     *
+     * @param requestList sid鍒楄〃
+     * @param callBack    鍥炶皟
+     */
+    public void UploadSidList(List<ListSidRequest> requestList, HDLLinkCallBack callBack) {
+        HDLSocket.getInstance().UploadSidList(requestList, callBack);
+    }
+
+    /**
      * 閫氱敤UDP鍙戦�佹寚浠�
      * 1绉掓病鍝嶅簲灏辫浠栭噸鏂板彂閫�,閲嶈瘯3娆�
      *

--
Gitblit v1.8.0