From 3f41182984d69d7fae703776edd1591f48dff93f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 22 十一月 2023 17:13:05 +0800
Subject: [PATCH] 2023年11月22日17:12:40

---
 app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 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 61bea23..30255a7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -4,10 +4,12 @@
 import android.text.TextUtils;
 
 import com.google.gson.Gson;
+import com.hdl.photovoltaic.HDLApp;
 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.utils.SharedPreUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -45,6 +47,9 @@
     private String userId;
     //褰撳墠鐨勪綇瀹匢D
     private String homeId;
+
+
+    private String homeName;
     //鏄惁鐧诲綍鐘舵��
     private boolean isLogin;
     //鏈湴閫氳绉橀挜
@@ -138,6 +143,14 @@
         this.homeId = homeId;
     }
 
+    public String getHomeName() {
+        return homeName == null ? "" : homeName;
+    }
+
+    public void setHomeName(String homeName) {
+        this.homeName = homeName;
+    }
+
     public boolean isAcceiptPolicy() {
         return acceiptPolicy;
     }
@@ -223,7 +236,8 @@
      * 鍒锋柊
      */
     private void reFresh() {
-        String str = HdlFileLogic.getInstance().readFile(FILENAME);
+        String str = HdlFileLogic.getInstance().readFile(HdlFileLogic.getInstance().getUserFilePath());
+//        String str =SharedPreUtils.getSharedPreferencesKey("UserConfigManage.json",HDLApp.getInstance());
         if (!TextUtils.isEmpty(str) && str.length() > 0) {
             //璇诲彇淇濆瓨鐨勬暟鎹�
             Gson gson = new Gson();
@@ -234,23 +248,20 @@
         }
     }
 
+
     /**
      * 淇濆瓨
      */
     public void Save() {
         if (sUserConfigManage == null) {
-            HdlLogLogic.print("UserConfigManage", "淇濆瓨鐢ㄦ埛淇℃伅鏂囦欢澶辫触");
+            HdlLogLogic.print("UserConfigManage淇濆瓨鐢ㄦ埛淇℃伅鏂囦欢澶辫触", false);
             return;
         }
         Gson gson = new Gson();
         String json = gson.toJson(sUserConfigManage);
-        HdlFileLogic.getInstance().writeFile(FILENAME, json);
+        HdlFileLogic.getInstance().writeFile(HdlFileLogic.getInstance().getUserFilePath(), json);
+//        SharedPreUtils.saveMyDataInfo("UserConfigManage.json", json, HDLApp.getInstance());
     }
-
-    /// <summary>
-    /// Config鏂囦欢鍚�
-    /// </summary>
-    private static final String FILENAME = HdlFileLogic.getInstance().getAPPInternalStoreFilesPath() + "/UserConfigManage.json";
 
 
 }

--
Gitblit v1.8.0