From 116def783f85af5896fc4500bc8a690d8b1eb5f3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:46:27 +0800
Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into wjc
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 43 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 36 insertions(+), 7 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 49d7dce..0f57fad 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -9,6 +9,7 @@
import com.hdl.hdlhttp.HxHttp;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.bean.HttpResponsePack;
+import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -27,6 +28,8 @@
import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
+import com.hdl.sdk.link.core.bean.request.BaseLocalRequest;
+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.gateway.HDLLinkLocalGateway;
@@ -42,6 +45,26 @@
*/
public class HdlDeviceLogic {
private static volatile HdlDeviceLogic sHdlDeviceLogic;
+
+ /**
+ * 鑾峰彇褰撳墠浣忓畢鐨勯�嗗彉鍣ㄥ垪琛�
+ */
+ public List<GatewayBean> getGatewayList() {
+ List<GatewayBean> newList = new ArrayList<>();
+ List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+ if (list.size() > 0) {
+ for (int i = 0; i < list.size(); i++) {
+ GatewayBean gatewayBean = list.get(i);
+ if (gatewayBean.getMaster().equals("true")
+ && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ if("0101050217BBC400".equals(gatewayBean.getOid()))//娴嬭瘯鏃惰繃婊ゆ帀鏃犳晥鐨勶紝鍚庨潰杩欏姞浠ｇ爜瑕佸垹闄�
+ continue;
+ newList.add(gatewayBean);
+ }
+ }
+ }
+ return newList;
+ }
/**
* 鑾峰彇褰撳墠瀵硅薄
@@ -68,7 +91,7 @@
* @param sid -
* @param oid -
* @param name -
- * @param cloudCallBeak
+ * @param cloudCallBeak -
*/
public void addInverterDeviceToCloud(String mac, String spk, String sid, String oid, String name, CloudCallBeak<Boolean> cloudCallBeak) {
@@ -263,7 +286,7 @@
* @param mac 璁惧mac
* @param linkCallBack 鍥炶皟update
*/
- public void steGatewayParam(String mac, LinkCallBack<Boolean> linkCallBack) {
+ public void setGatewayRemoteParam(String mac, LinkCallBack<Boolean> linkCallBack) {
String requestUrl = TopicApi.SET_GATEWAY_REMOTE_EDIT;
JsonObject json = new JsonObject();
json.addProperty("homeId", UserConfigManage.getInstance().getHomeId());
@@ -375,11 +398,17 @@
return;
}
Gson gson = new Gson();
- Type typeOfT = new TypeToken<List<OidBean>>() {
+ Type typeOfT = new TypeToken<BaseLocalResponse<List<OidBean>>>() {
}.getType();
- List<OidBean> list = gson.fromJson(json, typeOfT);
- if (linkCallBack != null) {
- linkCallBack.onSuccess(list);
+ BaseLocalResponse<List<OidBean>> baseLocalResponse = gson.fromJson(json, typeOfT);
+
+ if (linkCallBack == null) {
+ return;
+ }
+ if (baseLocalResponse == null || baseLocalResponse.getObjects() == null) {
+ linkCallBack.onSuccess(new ArrayList<>());
+ } else {
+ linkCallBack.onSuccess(baseLocalResponse.getObjects());
}
}
@@ -428,7 +457,7 @@
}
}
for (int i = 0; i < removeSidList.size(); i++) {
- //鑾峰彇鏈湴鐨勬绫虫尝
+ //鑾峰彇鏈湴鐨勯�嗗彉鍣�
removeInverter(removeSidList.get(i));
}
--
Gitblit v1.8.0