From b2d2e6dcf6ec38a2f24721f2bc925d634a6eb78d Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 05 十二月 2023 18:31:01 +0800
Subject: [PATCH] 2023年12月05日18:30:40
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 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 46420a7..e72dbb6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -47,6 +47,9 @@
private String userId;
//褰撳墠鐨勪綇瀹匢D
private String homeId;
+
+
+ private String homeName;
//鏄惁鐧诲綍鐘舵��
private boolean isLogin;
//鏈湴閫氳绉橀挜
@@ -74,7 +77,51 @@
//杩滅▼杩炴帴鐨凪qtt鐨勫鎴风ID
public String connEmqClientId;
//褰撳墠鐧诲綍鐨勮处鍙锋槸涓嶆槸涔嬪墠鐨勮处鍙�
- public boolean theSameLoginAccount;
+ private boolean theSameLoginAccount;
+
+ //缁戝畾鎵嬫満鍙�
+ private String bingPhone;
+ //缁戝畾閭
+ private String bingEmail;
+
+ //娓╁害鍗曚綅(C鎽勬皬搴�;F=鍗庢皬搴�)
+ private String temperature_unit = "鈩�";
+
+ //app褰撳墠鐨勮瑷�
+ private String currentAppLanguage;
+
+ public String getCurrentAppLanguage() {
+ return currentAppLanguage;
+ }
+
+ public void setCurrentAppLanguage(String currentAppLanguage) {
+ this.currentAppLanguage = currentAppLanguage;
+ }
+
+ public String getTemperature_unit() {
+ return temperature_unit;
+ }
+
+ public void setTemperature_unit(String temperature_unit) {
+ this.temperature_unit = temperature_unit;
+ }
+
+ public String getBingPhone() {
+ return bingPhone == null ? "" : bingPhone;
+ }
+
+ public void setBingPhone(String bingPhone) {
+ this.bingPhone = bingPhone;
+ }
+
+
+ public String getBingEmail() {
+ return bingEmail == null ? "" : bingEmail;
+ }
+
+ public void setBingEmail(String bingEmail) {
+ this.bingEmail = bingEmail;
+ }
/**
* 鐢ㄦ埛鍚嶇О
@@ -138,6 +185,14 @@
public void setHomeId(String homeId) {
this.homeId = homeId;
+ }
+
+ public String getHomeName() {
+ return homeName == null ? "" : homeName;
+ }
+
+ public void setHomeName(String homeName) {
+ this.homeName = homeName;
}
public boolean isAcceiptPolicy() {
@@ -225,7 +280,7 @@
* 鍒锋柊
*/
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) {
//璇诲彇淇濆瓨鐨勬暟鎹�
@@ -243,20 +298,14 @@
*/
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