From 8161c48c9f451e72bd7e5f3b6cd33043d1e2ca62 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 29 六月 2023 15:36:33 +0800
Subject: [PATCH] 2023年06月29日15:36:31
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 33 +++++++++++++++++++++++++--------
1 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index da64b67..dbb5f4f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -4,6 +4,7 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
+import com.hdl.hdlhttp.HxHttp;
import com.hdl.photovoltaic.bean.HttpResponsePack;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -24,6 +25,8 @@
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+
+import io.reactivex.rxjava3.disposables.Disposable;
/**
* 璁惧閫昏緫鐨勭晫闈�
@@ -85,13 +88,13 @@
/**
* 鑾峰彇閫嗗彉鍣ㄥ垪琛�
*
- * @param inverterDeviceBean 閫嗗彉鍣ㄥ璞�
- * @param cloudCallBeak 鍥炶皟
+ * @param homeId 浣忓畢id
+ * @param cloudCallBeak 鍥炶皟
*/
- public void getInverterDeviceList(InverterDeviceBean inverterDeviceBean, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
+ public void getInverterDeviceList(String homeId, CloudCallBeak<CloudInverterDeviceBean> cloudCallBeak) {
String requestUrl = HttpApi.POST_Device_List;
JsonObject json = new JsonObject();
- json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ json.addProperty("homeId", homeId);
// json.addProperty("zoneType", "password");//鍖哄煙
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
@@ -233,11 +236,25 @@
}
- public void searchGateway(GatewayCallBack gatewayCallBack)
- {
- List<String> spks = new ArrayList<>();
- spks.add("energy.hdl_inverter");
+ /**
+ * 鎼滅储缃戝叧鍒楄〃
+ *
+ * @param gatewayCallBack -
+ */
+ public void searchGateway(GatewayCallBack gatewayCallBack) {
+ List<String> spks = this.getGatewaySpk();
//缃戝叧鎼滅储
HDLLinkLocalGateway.getInstance().refreshGatewayByHomeIdAndSpk(UserConfigManage.getInstance().getHomeId(), spks, true, gatewayCallBack);
}
+
+ /**
+ * 鑾峰彇缃戝叧spk鍒楄〃
+ *
+ * @return -
+ */
+ private List<String> getGatewaySpk() {
+ List<String> spks = new ArrayList<>();
+ spks.add("energy.hdl_inverter");
+ return spks;
+ }
}
--
Gitblit v1.8.0