From 32b5f366ceaad4aa9a33eccf0b109eef24175495 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 10 十月 2023 14:55:01 +0800 Subject: [PATCH] 2023年10月10日14:54:56 --- app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 43 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 34 insertions(+), 9 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..cc842ec 100644 --- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java +++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java @@ -7,13 +7,13 @@ 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 { @@ -47,9 +47,15 @@ private String homeId; //鏄惁鐧诲綍鐘舵�� private boolean isLogin; + //鏈湴閫氳绉橀挜 + private String localSecret; //鏄惁鏄疊绔处鍙风櫥褰� private boolean isB_account; + + + //鏄惁鏄敤鎴蜂綋楠岃处鍙风櫥褰� + private boolean isUserExperience; //浣忓畢鏂囦欢鍒楄〃 public List<String> homeFilePathList = new ArrayList<>(); @@ -156,21 +162,37 @@ isB_account = b; } - /** - * 褰撳墠浣忓畢 - */ - private HouseListBean m_Home = null; + public boolean isUserExperience() { + return isUserExperience; + } + + public void setUserExperience(boolean userExperience) { + isUserExperience = userExperience; + } + + public String getLocalSecret() { + return localSecret == null ? "" : localSecret; + } + + public void setLocalSecret(String localSecret) { + this.localSecret = localSecret; + } /** * 褰撳墠浣忓畢 */ - public HouseListBean home() { + private HouseInfoBean m_Home = null; + + /** + * 褰撳墠浣忓畢 + */ + 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; } @@ -207,4 +229,7 @@ private static final String FILENAME = "UserConfigManage.json"; + + + } -- Gitblit v1.8.0