From da53ba3b968531f4d9af8bc6487d174309281c0f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 16:13:39 +0800
Subject: [PATCH] 2023年12月05日16:13:31
---
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 7 ++-----
1 files changed, 2 insertions(+), 5 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 046f812..b6834cd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -103,14 +103,11 @@
* 鑾峰彇褰撳墠浣忓畢鐨勩�愪富銆戦�嗗彉鍣ㄥ垪琛�
*/
public GatewayBean getCurrentHomeMainGateway() {
- List<GatewayBean> list = HDLLinkLocalGateway.getInstance().getGatewayList();
+ List<GatewayBean> list = this.getCurrentHomeGatewayList();
if (list.size() > 0) {
for (int i = 0; i < list.size(); i++) {
GatewayBean gatewayBean = list.get(i);
- if (TextUtils.isEmpty(gatewayBean.getDevice_mac())) {
- continue;
- }
- if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue) && gatewayBean.getHomeId().equals(UserConfigManage.getInstance().getHomeId())) {
+ if (gatewayBean.getMaster().equals(GatewayMasterType.MasterTrue)) {
//鎵惧埌杩斿洖
return gatewayBean;
}
--
Gitblit v1.8.0