From d1ebb94e1a17b7c25d4fcf73d85345d92cc86b5c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 02 一月 2024 18:41:34 +0800
Subject: [PATCH] 2024年01月02日18:41:32
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 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 ac7d370..5c91849 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -452,14 +452,12 @@
/**
* 鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣�
*
- * @param homeId 浣忓畢id
* @param tempType 娓╁害鍗曚綅绫诲瀷 (C 锛氭憚姘忓害锛� F 锛氬崕姘忓害)
* @param cloudCallBeak -
*/
- public void setResidenceTemperatureUnit(String homeId, String tempType, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void setResidenceTemperatureUnit(String tempType, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.POST_C_F_CustomConfig;
JsonObject json = new JsonObject();
- json.addProperty("homeId", homeId);
json.addProperty("tempType", tempType);
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
@@ -483,13 +481,12 @@
/**
* 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�
*
- * @param homeId 浣忓畢id
* @param cloudCallBeak -
*/
- public void getResidenceTemperatureUnit(String homeId, CloudCallBeak<String> cloudCallBeak) {
+ public void getResidenceTemperatureUnit(CloudCallBeak<String> cloudCallBeak) {
String requestUrl = HttpApi.POST_C_F_CustomConfigInfo;
JsonObject json = new JsonObject();
- json.addProperty("homeId", homeId);
+// json.addProperty("homeId", homeId);
List<MessageBean> list = new ArrayList<>();
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -574,14 +571,29 @@
}
/**
+ * 鑾峰彇浣忓畢Id瀵硅薄
+ *
+ * @param homeId 浣忓畢id
+ * @return 鍒楄〃绱㈠紩
+ */
+ public HouseIdBean getHouseId(String homeId) {
+ for (int i = 0; i < houseIdList.size(); i++) {
+ if (houseIdList.get(i).getHomeId().equals(homeId)) {
+ return houseIdList.get(i);
+ }
+ }
+ return null;
+ }
+
+ /**
* 鍒囨崲浣忓畢
*
* @param houseIdBean 浣忓畢Id瀵硅薄
*/
public void switchHouse(HouseIdBean houseIdBean) {
- String oidHomeId = UserConfigManage.getInstance().getHomeId();
- if (houseIdBean.getHomeId().equals(oidHomeId)) {
- HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�");
+ String homeId = UserConfigManage.getInstance().getHomeId();
+ if (houseIdBean.getHomeId().equals(homeId)) {
+ HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�--->" + homeId);
return;
}
//璁㈤槄瑕佸叏閮ㄥ彇娑�
--
Gitblit v1.8.0