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 | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 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 41dcd14..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;
//鏈湴閫氳绉橀挜
@@ -62,7 +67,7 @@
//鍒ゆ柇褰撳墠鏃堕棿鐐规槸鍚﹁兘澶熻嚜鍔ㄧ櫥褰�
public boolean isAutoLogin() {
//7澶╁唴鑷姩鐧诲綍
- return ((System.currentTimeMillis() - loginDateTime) < 7 * 24 * 60 * 60);
+ return ((System.currentTimeMillis() - loginDateTime) < (7 * 24 * 60 * 60 * 1000));
}
//鏄惁鍚屾剰闅愮鏀跨瓥
@@ -73,6 +78,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;
@@ -122,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;
}
@@ -154,6 +183,11 @@
this.theSameLoginAccount = theSameLoginAccount;
}
+ /**
+ * 鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
+ *
+ * @return -
+ */
public boolean isBAccount() {
return isB_account;
}
@@ -202,34 +236,32 @@
* 鍒锋柊
*/
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();
sUserConfigManage = gson.fromJson(str, UserConfigManage.class);
+ if (sUserConfigManage == null) {
+ sUserConfigManage = new UserConfigManage();
+ }
}
}
+
/**
* 淇濆瓨
*/
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 = "UserConfigManage.json";
-
-
-
}
--
Gitblit v1.8.0