From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 6026c77..8ddb2c1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -38,7 +38,7 @@
//uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
- private int uniBottomSafeDistanceBackgroundColor;
+ private int uniBottomSafeDistanceBackgroundColor = 1;
//褰撳墠璐﹀彿锛氬埛鏂癟oken鐢ㄧ殑token(涓嶇敤璁板綍浠�涔堟湁鏁堟湡,濡傛灉鍒锋柊澶辫触,灏辫涪浜哄嵆鍙�)
private String refreshToken;
//璐︽埛鐧诲綍鎴愬姛鏃剁殑鏃堕棿
@@ -61,7 +61,16 @@
//鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
private boolean isB_account;
+ //鏄惁姝ｅ紡鏈嶅姟鍣�(true锛氭寮忥紝false锛氭祴璇�)
+ private boolean isOnlineServer = false;
+ public boolean isOnlineServer() {
+ return isOnlineServer;
+ }
+
+ public void setOnlineServer(boolean onlineServer) {
+ isOnlineServer = onlineServer;
+ }
//鏄惁鏄敤鎴蜂綋楠岃处鍙风櫥褰�
private boolean isUserExperience;
@@ -113,6 +122,19 @@
*/
private boolean noNetworkFlag = false;
+ public boolean isAutomaticSkipNoNetworkFlag() {
+ return automaticSkipNoNetworkFlag;
+ }
+
+ public void setAutomaticSkipNoNetworkFlag(boolean automaticSkipNoNetworkFlag) {
+ this.automaticSkipNoNetworkFlag = automaticSkipNoNetworkFlag;
+ }
+
+ /**
+ * 鑷姩璺宠浆鍒版棤缃戞ā寮�(true=鍚屾剰璺宠浆,false=涓嶅悓鎰忚烦杞�)
+ */
+ private boolean automaticSkipNoNetworkFlag = false;
+
/**
* 鏃犵綉妯″紡璁惧mac
*/
--
Gitblit v1.8.0