From 770c89ab981b7659faabf8a812a25d99a11bdebf Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 16 四月 2026 08:40:43 +0800
Subject: [PATCH] 2026年04月16日08:40:19
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 159 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 137 insertions(+), 22 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 3bfc296..c47623d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -5,6 +5,8 @@
import com.google.gson.Gson;
import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.enums.Languages;
+import com.hdl.photovoltaic.enums.PowerStationType;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
@@ -38,7 +40,7 @@
//uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
- private int uniBottomSafeDistanceBackgroundColor;
+ private int uniBottomSafeDistanceBackgroundColor = 1;
//褰撳墠璐﹀彿锛氬埛鏂癟oken鐢ㄧ殑token(涓嶇敤璁板綍浠�涔堟湁鏁堟湡,濡傛灉鍒锋柊澶辫触,灏辫涪浜哄嵆鍙�)
private String refreshToken;
//璐︽埛鐧诲綍鎴愬姛鏃剁殑鏃堕棿
@@ -62,7 +64,45 @@
//鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
private boolean isB_account;
//鏄惁姝ｅ紡鏈嶅姟鍣�(true锛氭寮忥紝false锛氭祴璇�)
- private boolean isOnlineServer = false;
+ private boolean isOnlineServer = true;
+
+ //鏅鸿兘浣撴帴鍙ｅ瘑閽�
+ private String agentSecret;
+ //鏅鸿兘浣撴帴鍙ｅ湴鍧�
+ private String agentUrl;
+ //褰撳墠浼氳瘽ID
+ private String conversationId;
+ //鐢电珯绫诲瀷(INV = 閫嗗彉鍣ㄧ數绔�;BMS = BMS鐢电珯)
+ private String powerStationType = PowerStationType.INV;
+
+ public String getAgentUrl() {
+ return agentUrl == null ? "" : agentUrl;
+ }
+
+ public void setAgentUrl(String agentUrl) {
+ this.agentUrl = agentUrl;
+ }
+
+ /**
+ * 鏅鸿兘浣揂ppKey
+ *
+ * @return 鏅鸿兘浣揂ppKey
+ */
+ public String getAgentSecret() {
+ return agentSecret == null ? "" : agentSecret;
+ }
+
+ public void setAgentSecret(String agentApiKey) {
+ this.agentSecret = agentApiKey;
+ }
+
+ public String getConversationId() {
+ return conversationId == null ? "" : conversationId;
+ }
+
+ public void setConversationId(String conversationId) {
+ this.conversationId = conversationId;
+ }
public boolean isOnlineServer() {
return isOnlineServer;
@@ -108,19 +148,83 @@
private String userImageUrl = "/static/image/user-default-head.png";
- /// <summary>
- /// 娉ㄥ唽鏋佸厜ID
- /// </summary>
- private String registrationID;
- /// <summary>
- /// 娣诲姞鏋佸厜ID鍒颁簯绔垚鍔熸椂杩斿洖鐨�
- /// </summary>
+ /**
+ * 娉ㄥ唽鏋佸厜ID锛岃胺姝孎CM鐨勪护鐗�
+ */
+ private String pushToken;
+
+ /**
+ * 娣诲姞浠ょ墝鍒颁簯绔垚鍔熸椂杩斿洖鐨�
+ */
private String pushId;
/**
* 鏃犵綉妯″紡鏍囪瘑(true=鏃犵綉妯″紡,false=姝ｅ父妯″紡)
*/
private boolean noNetworkFlag = false;
+
+
+ /**
+ * 鏄惁鏄父瀹㈡ā寮�(true=娓稿妯″紡,false=姝ｅ父妯″紡)
+ */
+ private boolean tourist_mode = false;
+
+
+ /**
+ * 鏄惁鏄父瀹㈡ā寮�
+ *
+ * @return (true=娓稿妯″紡,false=姝ｅ父妯″紡)
+ */
+ public boolean isTourist_mode() {
+ return tourist_mode;
+ }
+
+ /**
+ * 鏄惁鏄父瀹㈡ā寮�
+ *
+ * @return (true=娓稿妯″紡,false=姝ｅ父妯″紡)
+ */
+ public void setTourist_mode(boolean tourist_mode) {
+ this.tourist_mode = tourist_mode;
+ }
+
+
+ /**
+ * 鐢ㄦ潵娓稿妯″紡鍐峰惎鍔ㄥ己鍒惰烦鍒扮櫥褰曠晫闈㈡爣璁�
+ * true=娓稿妯″紡,鍐峰惎鍔ㄥ己鍒惰烦杞櫥褰曠晫闈紝false锛氭寜姝ｅ父娴佺▼璺�
+ */
+ private boolean isTouristModeJumpLogic = false;
+
+ /**
+ * 鐢ㄦ潵娓稿妯″紡鍐峰惎鍔ㄥ己鍒惰烦鍒扮櫥褰曠晫闈㈡爣璁�
+ *
+ * @return true=娓稿妯″紡,鍐峰惎鍔ㄥ己鍒惰烦杞櫥褰曠晫闈紝false锛氭寜姝ｅ父娴佺▼璺�
+ */
+ public boolean isTouristModeJumpLogic() {
+ return isTouristModeJumpLogic;
+ }
+
+ /**
+ * 鐢ㄦ潵娓稿妯″紡鍐峰惎鍔ㄥ己鍒惰烦鍒扮櫥褰曠晫闈㈡爣璁�
+ *
+ * @return true=娓稿妯″紡,鍐峰惎鍔ㄥ己鍒惰烦杞櫥褰曠晫闈紝false锛氭寜姝ｅ父娴佺▼璺�
+ */
+ public void setTouristModeJumpLogic(boolean touristModeJumpLogic) {
+ isTouristModeJumpLogic = touristModeJumpLogic;
+ }
+
+ public boolean isAutomaticSkipNoNetworkFlag() {
+ return automaticSkipNoNetworkFlag;
+ }
+
+ public void setAutomaticSkipNoNetworkFlag(boolean automaticSkipNoNetworkFlag) {
+ this.automaticSkipNoNetworkFlag = automaticSkipNoNetworkFlag;
+ }
+
+ /**
+ * 鑷姩璺宠浆鍒版棤缃戞ā寮�(true=鍚屾剰璺宠浆,false=涓嶅悓鎰忚烦杞�)
+ */
+ private boolean automaticSkipNoNetworkFlag = false;
/**
* 鏃犵綉妯″紡璁惧mac
@@ -164,12 +268,12 @@
this.userImageUrl = userImageUrl;
}
- public String getRegistrationID() {
- return registrationID == null ? "" : registrationID;
+ public String getPushToken() {
+ return pushToken == null ? "" : pushToken;
}
- public void setRegistrationID(String registrationID) {
- this.registrationID = registrationID;
+ public void setPushToken(String pushToken) {
+ this.pushToken = pushToken;
}
public String getPushId() {
@@ -347,6 +451,18 @@
}
/**
+ * 鐢电珯绫诲瀷(INV = 閫嗗彉鍣ㄧ數绔�;BMS = BMS鐢电珯)
+ * @return 鐢电珯绫诲瀷(INV = 閫嗗彉鍣ㄧ數绔�;BMS = BMS鐢电珯)
+ */
+ public String getPowerStationType() {
+ return powerStationType;
+ }
+
+ public void setPowerStationType(String powerStationType) {
+ this.powerStationType = powerStationType;
+ }
+
+ /**
* uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
*
* @return 鍊�
@@ -383,6 +499,14 @@
return m_Home;
}
+ /**
+ * 鏄笉鏄樋鎷変集璇█
+ *
+ * @return true琛ㄧず鏄樋鎷変集璇█锛屽惁鍒欎笉鏄�
+ */
+ public boolean isArabicLanguage() {
+ return this.currentAppLanguage.equals(Languages.ar);
+ }
/**
* 鍒锋柊
@@ -413,15 +537,6 @@
String json = gson.toJson(sUserConfigManage);
HdlFileLogic.getInstance().writeFile(HdlFileLogic.getInstance().getUserFilePath(), json);
// SharedPreUtils.saveMyDataInfo("UserConfigManage.json", json, HDLApp.getInstance());
- }
-
- /**
- * true琛ㄧず鏄腑鏂�
- *
- * @return true琛ㄧず鏄腑鏂�
- */
- public boolean isZh() {
- return currentAppLanguage.equals(LocalManageUtil.zh);
}
--
Gitblit v1.8.0