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/app/src/main/java/com/hdl/hdlsdk/MainActivity.java |   32 ++++++++++++++++++++++++++++++--
 1 files changed, 30 insertions(+), 2 deletions(-)

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 5054c03..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
@@ -2,6 +2,7 @@
 
 import android.Manifest;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.util.Log;
@@ -14,6 +15,7 @@
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -23,9 +25,11 @@
 import com.google.gson.reflect.TypeToken;
 import com.hdl.hdlsdk.device.DevicesListActivity;
 import com.hdl.sdk.common.config.TopicConstant;
+import com.hdl.sdk.common.event.DeleteNetworkListener;
 import com.hdl.sdk.common.event.EventListener;
 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.gson.GsonConvert;
 import com.hdl.sdk.connect.HDLLink;
 import com.hdl.sdk.connect.bean.LinkResponse;
@@ -48,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";
@@ -55,10 +61,11 @@
     private RecyclerView rv;
     private TextView tv;
     private TextView responseTv;
+    private TextView localSecret;
     private EditText editText;
     boolean isOn;
     private EventListener allTopicsListener;
-    private String testLightSid = "0001010D48C71B02020100010101";
+    private String testLightSid = "02010131D9C03D01020300010107";
     private String secret = "";
 
     @Override
@@ -69,8 +76,10 @@
 
     void initDeviceInfo() {
         AuthenticateRequest.AuthenticateDeviceInfoBean infoBean = new AuthenticateRequest.AuthenticateDeviceInfoBean();
+
         infoBean.setDeviceMAC("f2c5d8bad48f");
         infoBean.setIPMAC("f2c5d8bad48f");
+
         infoBean.setDeviceName("闊充箰鎾斁鍣�");//璁惧鍚嶅瓧
         infoBean.setDeviceModel("MCLog.431");//璁惧鍨嬪彿
         infoBean.setAccessMode("WIFI");
@@ -144,7 +153,7 @@
         String spkStr = "screen.touch";//浜у搧spk
 //        String macStr = "AA00000000000100";//璁惧鍞竴MAC鍦板潃
         String macStr = editText.getText().toString();//璁惧鍞竴MAC鍦板潃
-//        String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑secret
+//        String secret = "e186beeb7974998e";//閫氳繃spk鍜宮ac鎻愪氦浜戠璁よ瘉鍚庡垎閰嶇殑
 
         String mac_key = stringToMD5(stringToMD5(macStr + secret));
         String versionString = "HDL_V1.0.1";//
@@ -164,6 +173,8 @@
         authbean.setSpk(spkStr);
         authbean.setMACKey(mac_key);
         authbean.setRequest(requestBean);
+        HDLLinkConfig.getInstance().setAuthBean(authbean);
+
         //HDLLinkConfig.getInstance().getDeviceInfoBean()杩欎釜鍒濆鍖栫殑鏃跺�欒鍏堣缃ソ
         AuthenticateRequest request = new AuthenticateRequest(IdUtils.getUUId(), time, HDLLinkConfig.getInstance().getDeviceInfoBean(), authbean);
         HDLLink.getInstance().startAuthenticateRequest(request, new HDLLinkCallBack() {
@@ -174,10 +185,12 @@
                 Log.e(TAG, "onError: 璁よ瘉澶辫触 " + e.getCode());
             }
 
+            @RequiresApi(api = Build.VERSION_CODES.O)
             @Override
             public void onSuccess(String msg) {
                 tv.setText("璁よ瘉鎴愬姛");
                 responseTv.setText(msg.toString());
+                localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
             }
         });
     }
@@ -207,6 +220,7 @@
         setContentView(R.layout.activity_main);
         responseTv = findViewById(R.id.response_tv);
         editText = findViewById(R.id.edittext);
+        localSecret = findViewById(R.id.local_secret);
         tv = findViewById(R.id.state_tv);
         rv = findViewById(R.id.rv);
         rv.setLayoutManager(new LinearLayoutManager(this));
@@ -215,6 +229,17 @@
         checkIfCertified();
         initDeviceInfo();//鍒濆鍖�
         registerAllTopicsListener();
+        HDLLink.getInstance().setDeleteNetworkListener(new DeleteNetworkListener() {
+            @Override
+            public void onSuccess(Object msg) {
+                LogUtils.i("setDeleteNetworkListener onSucceed = " + msg);
+            }
+
+            @Override
+            public void onFailure() {
+                LogUtils.i("setDeleteNetworkListener onFailure");
+            }
+        });
 
         ActivityResultLauncher<String[]> launcher = registerForActivityResult(new ActivityResultContracts.RequestMultiplePermissions(), new ActivityResultCallback<Map<String, Boolean>>() {
             @Override
@@ -352,6 +377,9 @@
             @Override
             public void onMessage(Object msg) {
                 LinkResponse response = (LinkResponse) msg;
+                if ("/user/all/custom/gateway/broadcast_reply".equals(response.getTopic())){
+                    localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
+                }
             }
         };
         HDLLink.getInstance().registerAllTopicsListener(allTopicsListener);

--
Gitblit v1.8.0