From 28880ba7540c523d3e50d35416422396ef802c50 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 25 十月 2023 18:16:45 +0800
Subject: [PATCH] 2023年10月25日18:16:37

---
 app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java |   70 +++++++++++++++++++++++++++++------
 1 files changed, 58 insertions(+), 12 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..61bea23 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,16 +47,22 @@
     private String homeId;
     //鏄惁鐧诲綍鐘舵��
     private boolean isLogin;
+    //鏈湴閫氳绉橀挜
+    private String localSecret;
 
-    //鏄惁鏄疊绔处鍙风櫥褰�
+    //鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
     private boolean isB_account;
+
+
+    //鏄惁鏄敤鎴蜂綋楠岃处鍙风櫥褰�
+    private boolean isUserExperience;
     //浣忓畢鏂囦欢鍒楄〃
     public List<String> homeFilePathList = new ArrayList<>();
 
     //鍒ゆ柇褰撳墠鏃堕棿鐐规槸鍚﹁兘澶熻嚜鍔ㄧ櫥褰�
     public boolean isAutoLogin() {
         //7澶╁唴鑷姩鐧诲綍
-        return ((System.currentTimeMillis() - loginDateTime) < 7 * 24 * 60 * 60);
+        return ((System.currentTimeMillis() - loginDateTime) < (7 * 24 * 60 * 60 * 1000));
     }
 
     //鏄惁鍚屾剰闅愮鏀跨瓥
@@ -67,6 +73,22 @@
     public String connEmqClientId;
     //褰撳墠鐧诲綍鐨勮处鍙锋槸涓嶆槸涔嬪墠鐨勮处鍙�
     public boolean theSameLoginAccount;
+
+    /**
+     * 鐢ㄦ埛鍚嶇О
+     *
+     * @return -
+     */
+    public String getUserName() {
+
+        return TextUtils.isEmpty(userName) ? account : userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    private String userName;//鐢ㄦ埛鍚嶇О
 
     public String getRefreshToken() {
         return refreshToken == null ? "" : refreshToken;
@@ -148,6 +170,11 @@
         this.theSameLoginAccount = theSameLoginAccount;
     }
 
+    /**
+     * 鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
+     *
+     * @return -
+     */
     public boolean isBAccount() {
         return isB_account;
     }
@@ -156,21 +183,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;
     }
@@ -185,6 +228,9 @@
             //璇诲彇淇濆瓨鐨勬暟鎹�
             Gson gson = new Gson();
             sUserConfigManage = gson.fromJson(str, UserConfigManage.class);
+            if (sUserConfigManage == null) {
+                sUserConfigManage = new UserConfigManage();
+            }
         }
     }
 
@@ -204,7 +250,7 @@
     /// <summary>
     /// Config鏂囦欢鍚�
     /// </summary>
-    private static final String FILENAME = "UserConfigManage.json";
+    private static final String FILENAME = HdlFileLogic.getInstance().getAPPInternalStoreFilesPath() + "/UserConfigManage.json";
 
 
 }

--
Gitblit v1.8.0