From 2c62031554742600f735baf74ea6a5776a1093a9 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 22 五月 2024 11:47:40 +0800
Subject: [PATCH] Merge branch 'feature/hxb' into develop_new
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 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 e404185..1823b5f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -21,6 +21,7 @@
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;
@@ -77,10 +78,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();
}
}
@@ -581,6 +582,37 @@
}
/**
+ * 鐢电珯鐘舵�佹瑙�(瀹夎鍟�)
+ */
+ public void getStatusOverview(CloudCallBeak<StatusOverviewBean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_statusOverview;
+ JsonObject json = new JsonObject();
+// json.addProperty("zoneType", zoneType);//鍖哄煙
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new StatusOverviewBean());
+ }
+ }
+ Gson gson = new Gson();
+ StatusOverviewBean statusOverviewBean = gson.fromJson(jsonStr, StatusOverviewBean.class);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(statusOverviewBean);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
* 娣诲姞浣忓畢(鐢电珯)鍒颁簯绔�
*
* @param houseInfoBean -
--
Gitblit v1.8.0