From fde174d256d4dced8bef6c439ec87cd888ad140b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 17:27:43 +0800
Subject: [PATCH] 2024年06月12日17:27:36
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index e962108..3e61f84 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -8,28 +8,18 @@
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
-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.api.HttpApi;
-import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
import com.hdl.photovoltaic.listener.CloudCallBeak;
-import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.ContactBean;
-import com.hdl.photovoltaic.ui.bean.DeviceBean;
import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
-import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.photovoltaic.ui.bean.StatusOverviewBean;
-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.config.HDLLinkConfig;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
-import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -78,10 +68,10 @@
}
public void clearHouseList() {
- if (houseInfoList == null) {
- return;
+ if (mHouseIdList != null && mHouseIdList.size() > 0) {
+ mHouseIdList.clear();
}
- if (houseInfoList.size() > 0) {
+ if (houseInfoList != null && houseInfoList.size() > 0) {
houseInfoList.clear();
}
}
@@ -580,6 +570,7 @@
});
}
+
/**
* 鐢电珯鐘舵�佹瑙�(瀹夎鍟�)
*/
@@ -896,7 +887,7 @@
//閲嶆柊鍒涘缓浣忓畢鏂囦欢澶�
HdlFileLogic.getInstance().createDirectory();
//杩涘幓浣忓畢璇︽儏鎼滅储涓�涓嬮�嗗彉鍣ㄥ垪琛�,鐩殑鏄缓绔嬮�氳閫氶亾;
- HdlDeviceLogic.getInstance().searchCurrentHomeGateway(null);
+ HdlDeviceLogic.getInstance().searchCurrentHomeGateway(houseIdBean.getHomeId(),null);
}
--
Gitblit v1.8.0