From 56f3e95c37cb85db78f34389cab97ba79406b217 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 27 六月 2023 11:00:53 +0800
Subject: [PATCH] Merge branch 'wjc'
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
index d45942c..b260bc2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -7,6 +7,7 @@
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
+import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.HouseListBean;
import java.util.ArrayList;
@@ -159,18 +160,18 @@
/**
* 褰撳墠浣忓畢
*/
- private HouseListBean m_Home = null;
+ private HouseInfoBean m_Home = null;
/**
* 褰撳墠浣忓畢
*/
- public HouseListBean home() {
+ public HouseInfoBean home() {
if (m_Home != null) {
return m_Home;
}
- m_Home = HdlResidenceLogic.getInstance().getHouseByHouseId(homeId);
+ m_Home = HdlResidenceLogic.getInstance().getHouse(homeId);
if (m_Home == null) {
- m_Home = new HouseListBean();
+ m_Home = new HouseInfoBean();
}
return m_Home;
}
--
Gitblit v1.8.0