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/config/UserConfigManage.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 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 a9dbe2b..fee18e9 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -7,11 +7,14 @@
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
-import com.hdl.photovoltaic.ui.bean.HouseListBean;
+import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import java.util.ArrayList;
import java.util.List;
+/**
+ * 鐢ㄦ埛淇℃伅绫�
+ */
public class UserConfigManage {
@@ -46,7 +49,7 @@
private boolean isLogin;
//鏄惁鏄疊绔处鍙风櫥褰�
- private boolean isB;
+ private boolean isB_account;
//浣忓畢鏂囦欢鍒楄〃
public List<String> homeFilePathList = new ArrayList<>();
@@ -145,29 +148,29 @@
this.theSameLoginAccount = theSameLoginAccount;
}
- public boolean isB() {
- return isB;
+ public boolean isBAccount() {
+ return isB_account;
}
- public void setB(boolean b) {
- isB = b;
+ public void setBAccount(boolean b) {
+ isB_account = b;
}
/**
* 褰撳墠浣忓畢
*/
- 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