From 05581cb7328000de65c5e8c1ef12b366b44b11b1 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 四月 2024 13:47:41 +0800
Subject: [PATCH] 2024年04月02日13:47:34

---
 app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java |   51 +++++++++++++++++++++++++++++----------------------
 1 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
index 3908f5f..b7b9330 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/test/TestMainActivity.java
@@ -8,17 +8,12 @@
 
 
 import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.reflect.TypeToken;
 import com.hdl.linkpm.sdk.core.exception.HDLException;
 import com.hdl.photovoltaic.base.CustomBaseActivity;
 import com.hdl.photovoltaic.config.UserConfigManage;
 import com.hdl.photovoltaic.databinding.ActivityTestMainBinding;
 import com.hdl.photovoltaic.enums.ShowErrorMode;
-import com.hdl.photovoltaic.internet.HttpClient;
 import com.hdl.photovoltaic.internet.TcpClient;
-import com.hdl.photovoltaic.internet.api.TopicApi;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.listener.LinkCallBack;
 import com.hdl.photovoltaic.other.HdlDeviceLogic;
@@ -28,12 +23,9 @@
 import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
 import com.hdl.sdk.link.common.exception.HDLLinkException;
 import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
-import com.hdl.sdk.link.core.bean.response.BaseLocalResponse;
 import com.hdl.sdk.link.core.callback.GatewayCallBack;
-import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
 import com.hdl.sdk.link.core.callback.ModbusCallBack;
 
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -71,8 +63,8 @@
      */
     private void initView() {
 
-        String homeId = "娴嬭瘯浣忓畢ID=" + UserConfigManage.getInstance().getHomeId();
-        String homeName = "娴嬭瘯浣忓畢鍚嶇О=" + UserConfigManage.getInstance().getHomeName();
+        String homeId = "homeId=" + UserConfigManage.getInstance().getHomeId();
+        String homeName = "homeName=" + UserConfigManage.getInstance().getHomeName();
         viewBinding.homeIdTv.setText(homeId);
         viewBinding.homeNameTv.setText(homeName);
 
@@ -121,6 +113,9 @@
 
         } else if (id == viewBinding.clickCommandTv.getId()) {
 
+        } else if (id == viewBinding.clickSelectDeviceTv.getId()) {
+//            selectDevice();
+
         }
     }
 
@@ -139,7 +134,7 @@
         s.add("涓婁紶oid鍒楄〃缁欎簯绔�(5)");
         s.add("鑾峰彇閫嗗彉鍣ㄤ笅鎸傝澶囧垪琛�(6)");
         s.add("鑾峰彇閫嗗彉鍣ㄧ殑淇℃伅(7)");
-//        s.add("鎭㈠鍑哄巶璁剧疆(8)");
+        s.add("鎭㈠鍑哄巶璁剧疆(8)");
         return s;
     }
 
@@ -172,17 +167,9 @@
             }
             break;
             case "鎼滅储銆愪綇瀹呫�戦�嗗彉鍣ㄥ垪琛�(1)": {
-                HdlDeviceLogic.getInstance().searchCurrentHomeGateway(new GatewayCallBack() {
-                    @Override
-                    public void onSuccess(List<GatewayBean> gatewayBeanList) {
-                        gsonConvertJsonStr(gatewayBeanList);
-                    }
+                List<GatewayBean> gatewayBeanList = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId());
 
-                    @Override
-                    public void onError(HDLLinkException e) {
-                        setError(e.getMsg(), e.getCode());
-                    }
-                });
+                gsonConvertJsonStr(gatewayBeanList);
             }
             break;
 
@@ -296,7 +283,7 @@
             }
             break;
             case "鎭㈠鍑哄巶璁剧疆(8)": {
-                HdlDeviceLogic.getInstance().initializeGateway("0B37BA09F722EEF0", new LinkCallBack<Boolean>() {
+                HdlDeviceLogic.getInstance().initializeGateway("0B31117BA09F722EEF0", new LinkCallBack<Boolean>() {
                     @Override
                     public void onSuccess(Boolean obj) {
                         gsonConvertJsonStr(obj);
@@ -382,6 +369,26 @@
         });
     }
 
+    /**
+     * 閫夋嫨閫嗗彉鍣ㄨ皟璇�
+     */
+    public void selectDevice(String homeId) {
+        showLoading();
+        HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(homeId, new CloudCallBeak<List<GatewayBean>>() {
+            @Override
+            public void onSuccess(List<GatewayBean> obj) {
+                hideLoading();
+
+
+            }
+
+            @Override
+            public void onFailure(HDLException e) {
+                hideLoading();
+            }
+        });
+    }
+
     public interface Listener {
         void Confirmation();
     }

--
Gitblit v1.8.0