From b77dc026ffd21dba8652d28409c51e27d3e5a76c Mon Sep 17 00:00:00 2001
From: 562935844@qq.com
Date: 星期四, 31 八月 2023 09:21:06 +0800
Subject: [PATCH] 更新sdk

---
 HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java |   48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 46 insertions(+), 2 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 00f4264..73cae8c 100644
--- a/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
+++ b/HDLSDK/app/src/main/java/com/hdl/hdlsdk/MainActivity.java
@@ -25,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;
@@ -59,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
@@ -185,6 +188,7 @@
             public void onSuccess(String msg) {
                 tv.setText("璁よ瘉鎴愬姛");
                 responseTv.setText(msg.toString());
+                localSecret.setText("瀵嗛挜锛�" + HDLLinkConfig.getInstance().getLocalSecret());
             }
         });
     }
@@ -214,6 +218,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));
@@ -222,6 +227,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
@@ -301,7 +317,7 @@
                         break;
                     case 9:
                         //鍦烘櫙鎺у埗
-                        controlScene();
+                        getScene();
                         break;
                     case 10:
                         //鍔熻兘鍒楄〃
@@ -359,6 +375,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);
@@ -560,6 +579,7 @@
             @Override
             public void onSuccess(String msg) {
                 responseTv.setText(msg);
+                Log.d("panlili", "MainActivity.java:getSceneList-----> " + msg);
             }
 
             @Override
@@ -573,6 +593,30 @@
     // {"id":"8a5eaa143ce943b987b577df5a66759b","time_stamp":"1637040217235","objects":[{"sid":"04010560D2C7170A0A0100000000","name":"鍥炲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634871490"},{"sid":"04010560D2C76E0A0A0100010000","name":"绂诲妯″紡","status":"off","group":"255","delay":"0","modify_time":"1634785823"}]}
 
     /**
+     * 鑾峰彇鍦烘櫙璇︽儏
+     * 鎵ц鎴愬姛鐨勮瘽 鍝嶅簲code涓�200
+     */
+    void getScene() {
+        tv.setText("鍦烘櫙璇诲彇");
+        responseTv.setText("");
+        //鍦烘櫙sid鍒楄〃锛屾敮鎸佹壒閲忚鍙�
+        List<String> sids = new ArrayList<>();
+        sids.add("0201034C50B53F0A0A0100011100");
+        sids.add("0201037F50B53F0A0A0100021100");
+        HDLLink.getInstance().getScene(sids, new HDLLinkCallBack() {
+            @Override
+            public void onSuccess(String msg) {
+                responseTv.setText(msg);
+            }
+
+            @Override
+            public void onError(HDLLinkException e) {
+                responseTv.setText(e.getMsg());
+            }
+        });
+    }
+
+    /**
      * 鎺у埗鍦烘櫙
      * 鎵ц鎴愬姛鐨勮瘽 鍝嶅簲code涓�200
      */

--
Gitblit v1.8.0