From b8209d15d915f72d9abe3a68b76e1f4cfd21eac3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 23 九月 2023 14:37:00 +0800
Subject: [PATCH] 2023年09月23日14:36:51

---
 app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java |   28 +++++++++++++++++++---------
 1 files changed, 19 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..b3e8d5c 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,6 +47,8 @@
     private String homeId;
     //鏄惁鐧诲綍鐘舵��
     private boolean isLogin;
+    //鏈湴閫氳绉橀挜
+    private String localSecret;
 
     //鏄惁鏄疊绔处鍙风櫥褰�
     private boolean isB_account;
@@ -156,21 +158,29 @@
         isB_account = b;
     }
 
-    /**
-     * 褰撳墠浣忓畢
-     */
-    private HouseListBean m_Home = null;
+    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;
     }

--
Gitblit v1.8.0