From 07671116767c77058b3ce584be161b4b194ec9bd Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 30 六月 2023 15:57:59 +0800
Subject: [PATCH] Merge branch 'hxb' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into hxb
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 81 insertions(+), 10 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..f914f0e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -4,10 +4,14 @@
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.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
+import com.hdl.photovoltaic.internet.TcpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
+import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
@@ -19,11 +23,14 @@
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
+import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+
+import io.reactivex.rxjava3.disposables.Disposable;
/**
* 璁惧閫昏緫鐨勭晫闈�
@@ -85,13 +92,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() {
@@ -187,9 +194,9 @@
* 鍏ㄩ噺鏇存柊OID
*
* @param oidList oid鍒楄〃
- * @param cloudCallBeak 鍥炶皟
+ * @param cloudCallBeak 鍥炶皟update
*/
- public void fullRenewalOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void fullUpdateOid(List<OidBean> oidList, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.POST_Device_ChildDevices_List;
JsonObject json = new JsonObject();
json.addProperty("operationSource", "PROGRAM_ENERGY");//
@@ -233,11 +240,75 @@
}
- public void searchGateway(GatewayCallBack gatewayCallBack)
- {
- List<String> spks = new ArrayList<>();
- spks.add("energy.hdl_inverter");
+ /**
+ * 璁剧疆缃戝叧杩滅▼鍙傛暟
+ *
+ * @param mac 璁惧mac
+ * @param cloudCallBeak 鍥炶皟update
+ */
+ public void steGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = TopicApi.GATEWAY_SEND_REMOTE_EDIT;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
+ json.addProperty("server_addr", AppConfigManage.getUserRegionUrl());
+ json.addProperty("local_secret", UserConfigManage.getInstance().getLocalSecret());
+ TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
+ }
+
+ /**
+ * 缂栬緫缃戝叧鍙傛暟
+ *
+ * @param mac 璁惧mac
+ * @param cloudCallBeak 鍥炶皟update
+ */
+ public void steEditGatewayParam(String mac, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = TopicApi.GATEWAY_SEND_EDIT;
+ JsonObject json = new JsonObject();
+ json.addProperty("master", "true");
+ TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
+ @Override
+ public void onSuccess(String msg) {
+
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+
+ }
+ });
+
+ }
+
+
+ /**
+ * 鎼滅储缃戝叧鍒楄〃
+ *
+ * @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