From 14de918a79943e4961b09fa01ed320c6cad41f2e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 28 六月 2023 17:14:51 +0800
Subject: [PATCH] Revert "Revert "Merge branch 'hxb' into wjc""
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 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 1faea0a..fcdf6ec 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -53,6 +53,9 @@
}
public void setHouseInfoList(List<HouseInfoBean> houseInfoList) {
+ if (houseInfoList == null) {
+ houseInfoList = new ArrayList<>();
+ }
this.houseInfoList = houseInfoList;
}
@@ -66,6 +69,9 @@
}
public void setHouseIdList(List<HouseIdBean> houseIdList) {
+ if (houseIdList == null) {
+ houseIdList = new ArrayList<>();
+ }
this.houseIdList = houseIdList;
}
@@ -82,7 +88,7 @@
*/
public void getHouseList(CloudCallBeak<Boolean> cloudCallBeak) {
//鑾峰彇浣忓畢ID鍒楄〃
- getResidenceList("", "", new CloudCallBeak<List<HouseIdBean>>() {
+ getResidenceIdList("", "", new CloudCallBeak<List<HouseIdBean>>() {
@Override
public void onSuccess(List<HouseIdBean> houseListBeanIDList) {
if (houseListBeanIDList != null && houseListBeanIDList.size() > 0) {
@@ -151,7 +157,7 @@
* @param key 鍙戠數鍔熺巼鎺掑簭(powerSort);浠婃棩鍙戠數閲忔帓搴�(todayElectricitySort);鍒涘缓鏃堕棿鎺掑簭(createTimeSort);
* @param keyValue (descending:闄嶅簭ascending:鍗囧簭),
*/
- public void getResidenceList(String key, String keyValue, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {
+ public void getResidenceIdList(String key, String keyValue, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {
String requestUrl = HttpApi.POST_PowerStation_List;
JsonObject json = new JsonObject();
@@ -401,24 +407,36 @@
}
/**
- * 鍒囨崲浣忓畢
- *
- * @param homeId 浣忓畢id
+ * 鑾峰彇浣忓畢鍥剧墖
*/
- public Boolean switchHouse(String homeId) {
- UserConfigManage.getInstance().setHomeId(homeId);
- HdlThreadLogic.runThread(new Runnable() {
+ public void getResidenceImage(String imageUrl, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {
+ String requestUrl = imageUrl;
+ JsonObject json = new JsonObject();
+ List<HouseIdBean> list = new ArrayList<>();
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
@Override
- public void run() {
- //鎼滅储涓�涓嬩綇瀹呰澶�
+ public void onSuccess(HttpResponsePack httpResponsePack) {
+ if (httpResponsePack != null && httpResponsePack.getData() != null) {
+ Gson gson = new Gson();
+ String jsonStr = gson.toJson(httpResponsePack.getData());
+ HouseBeanClass houseInfoBeanClass = gson.fromJson(jsonStr, HouseBeanClass.class);
+ } else {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
}
- }, null, null);
- //鍏抽棴杩涘害鏉�
+ @Override
+ public void onFailure(Exception exception) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(exception);
+ }
+ }
+ });
- return true;
+
}
-
/**
* 娣诲姞銆愪綇瀹呰鎯呫�戝埌鏈湴缂撳瓨
@@ -481,6 +499,26 @@
}
}
+ /**
+ * 鍒囨崲浣忓畢
+ *
+ * @param homeId 浣忓畢id
+ */
+ public Boolean switchHouse(String homeId) {
+ String oidHomeId = UserConfigManage.getInstance().getHomeId();
+ HdlFileLogic.getInstance().deleteDirectory(HdlFileLogic.getInstance().getCurrentHomeRootPath());
+ UserConfigManage.getInstance().setHomeId(homeId);
+ HdlFileLogic.getInstance().createDirectory();
+
+ HdlThreadLogic.runThread(new Runnable() {
+ @Override
+ public void run() {
+ //鎼滅储涓�涓嬩綇瀹呰澶�
+ }
+ }, null, null);
+ return true;
+ }
+
static class HouseBeanClass {
--
Gitblit v1.8.0