From 30859ca8f2175475d2c666353bc27f3b2ceede53 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 22 八月 2024 13:43:47 +0800
Subject: [PATCH] 2024年08月22日13:43:45
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 191 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 170 insertions(+), 21 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 2e70ddb..fb8da04 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -4,16 +4,19 @@
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.HouseListBean;
+import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
+import com.hdl.photovoltaic.utils.LocalManageUtil;
+import com.hdl.photovoltaic.utils.SharedPreUtils;
import java.util.ArrayList;
import java.util.List;
/**
- * 涓汉淇℃伅绫�
+ * 鐢ㄦ埛淇℃伅绫�
*/
public class UserConfigManage {
@@ -45,18 +48,27 @@
private String userId;
//褰撳墠鐨勪綇瀹匢D
private String homeId;
+
+
+ private String homeName;
//鏄惁鐧诲綍鐘舵��
private boolean isLogin;
+ //鏈湴閫氳绉橀挜
+ private String localSecret;
- //鏄惁鏄疊绔处鍙风櫥褰�
- private boolean isB;
+ //鏄惁鏄疊绔处鍙风櫥褰�(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));
}
//鏄惁鍚屾剰闅愮鏀跨瓥
@@ -66,7 +78,105 @@
//杩滅▼杩炴帴鐨凪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;
+
+
+ //鐢ㄦ埛澶村儚
+ private String userImageUrl = "/static/image/user-default-head.png";
+
+
+ /// <summary>
+ /// 娉ㄥ唽鏋佸厜ID
+ /// </summary>
+ public String registrationID;
+ /// <summary>
+ /// 娣诲姞鏋佸厜ID鍒颁簯绔垚鍔熸椂杩斿洖鐨�
+ /// </summary>
+ public String pushId;
+
+ public String getUserImageUrl() {
+ return userImageUrl == null ? "/static/image/user-default-head.png" : userImageUrl;
+ }
+
+ public void setUserImageUrl(String userImageUrl) {
+ this.userImageUrl = userImageUrl;
+ }
+
+ 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;
+ }
+
+ /**
+ * 鐢ㄦ埛鍚嶇О
+ *
+ * @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;
@@ -116,6 +226,14 @@
this.homeId = homeId;
}
+ public String getHomeName() {
+ return homeName == null ? "" : homeName;
+ }
+
+ public void setHomeName(String homeName) {
+ this.homeName = homeName;
+ }
+
public boolean isAcceiptPolicy() {
return acceiptPolicy;
}
@@ -148,29 +266,50 @@
this.theSameLoginAccount = theSameLoginAccount;
}
- public boolean isB() {
- return isB;
+ /**
+ * 鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
+ *
+ * @return -
+ */
+ public boolean isBAccount() {
+ return isB_account;
}
- public void setB(boolean b) {
- isB = b;
+ public void setBAccount(boolean b) {
+ isB_account = b;
+ }
+
+ 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;
}
/**
* 褰撳墠浣忓畢
*/
- private HouseListBean m_Home = null;
+ private HouseInfoBean m_Home = null;
/**
* 褰撳墠浣忓畢
*/
- public HouseListBean home() {
+ 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;
}
@@ -180,31 +319,41 @@
* 鍒锋柊
*/
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";
+ /**
+ * true琛ㄧず鏄腑鏂�
+ *
+ * @return true琛ㄧず鏄腑鏂�
+ */
+ public boolean isZh() {
+ return currentAppLanguage.equals(LocalManageUtil.zh);
+ }
}
--
Gitblit v1.8.0