From 159dcb5c3b04a268c20c131df4ab99c1ae12e7db Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 26 一月 2024 18:29:47 +0800
Subject: [PATCH] 2024年01月26日18:29:37
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 100 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 91 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 61bea23..6602b66 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;
//鏈湴閫氳绉橀挜
@@ -72,7 +77,78 @@
//杩滅▼杩炴帴鐨凪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;
+
+
+ /// <summary>
+ /// 娉ㄥ唽鏋佸厜ID
+ /// </summary>
+ public String registrationID;
+ /// <summary>
+ /// 娣诲姞鏋佸厜ID鍒颁簯绔垚鍔熸椂杩斿洖鐨�
+ /// </summary>
+ public String pushId;
+
+
+ public String getRegistrationID() {
+ return registrationID == null ? "" : registrationID;
+ }
+
+ public void setRegistrationID(String registrationID) {
+ this.registrationID = registrationID;
+ }
+
+ public String getPushId() {
+ return pushId == null ? "" : pushId;
+ }
+
+ public void setPushId(String pushId) {
+ this.pushId = pushId;
+ }
+
+ 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;
+ }
/**
* 鐢ㄦ埛鍚嶇О
@@ -136,6 +212,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() {
@@ -223,7 +307,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 +319,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