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 | 24 ++++++++++++++++--------
1 files changed, 16 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 1cc6471..0f57fad 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -28,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;
@@ -39,7 +41,7 @@
import io.reactivex.rxjava3.disposables.Disposable;
/**
- * 璁惧閫昏緫鐨勭晫闈�
+ * 璁惧閫昏緫
*/
public class HdlDeviceLogic {
private static volatile HdlDeviceLogic sHdlDeviceLogic;
@@ -53,15 +55,15 @@
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
- if (!TextUtils.isEmpty(gatewayBean.getHomeId())
+ if (gatewayBean.getMaster().equals("true")
&& gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ if("0101050217BBC400".equals(gatewayBean.getOid()))//娴嬭瘯鏃惰繃婊ゆ帀鏃犳晥鐨勶紝鍚庨潰杩欏姞浠ｇ爜瑕佸垹闄�
+ continue;
newList.add(gatewayBean);
}
-
}
}
return newList;
-
}
/**
@@ -396,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());
}
}
--
Gitblit v1.8.0