From 29e200b8db74d31f49d4d1ac64a41ad44e1b3a90 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 07 七月 2025 11:56:35 +0800
Subject: [PATCH] Merge branch 'master' into 1.2.1_google

---
 app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java |   62 +++++++++++++++++++++++++++---
 1 files changed, 55 insertions(+), 7 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 15fb829..81c9c0b 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;
@@ -102,11 +111,50 @@
     /// <summary>
     /// 娉ㄥ唽鏋佸厜ID
     /// </summary>
-    public String registrationID;
+    private String registrationID;
     /// <summary>
     /// 娣诲姞鏋佸厜ID鍒颁簯绔垚鍔熸椂杩斿洖鐨�
     /// </summary>
-    public String pushId;
+    private String pushId;
+
+    /**
+     * 鏃犵綉妯″紡鏍囪瘑(true=鏃犵綉妯″紡,false=姝ｅ父妯″紡)
+     */
+    private boolean noNetworkFlag = false;
+
+    /**
+     * 鏃犵綉妯″紡璁惧mac
+     */
+    private String noNetworkDeviceMac;
+    /**
+     * 鏃犵綉妯″紡璁惧鐧诲綍M瀵嗙爜
+     */
+    private String noNetworkPassword;
+
+    public boolean isNoNetworkFlag() {
+        return noNetworkFlag;
+    }
+
+    public void setNoNetworkFlag(boolean noNetworkFlag) {
+        this.noNetworkFlag = noNetworkFlag;
+    }
+
+    public String getNoNetworkDeviceMac() {
+        return noNetworkDeviceMac == null ? "" : noNetworkDeviceMac;
+    }
+
+    public void setNoNetworkDeviceMac(String noNetworkDeviceMac) {
+        this.noNetworkDeviceMac = noNetworkDeviceMac;
+    }
+
+    public String getNoNetworkPassword() {
+        return noNetworkPassword == null ? "" : noNetworkPassword;
+    }
+
+    public void setNoNetworkPassword(String noNetworkPassword) {
+        this.noNetworkPassword = noNetworkPassword;
+    }
+
 
     public String getUserImageUrl() {
         return userImageUrl == null ? "/static/image/user-default-head.png" : userImageUrl;
@@ -304,16 +352,16 @@
      * @return 鍊�
      */
     public int getUniBottomSafeDistanceBackgroundColor() {
-        return uniBottomSafeDistanceBackgroundColor;
+        return this.uniBottomSafeDistanceBackgroundColor;
     }
 
     /**
      * uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
      *
-     * @param uniBottomSafeDistanceBackgroundColor 锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
+     * @param uniBottomSafeDistanceBackgroundColorValue 锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
      */
-    public void setUniBottomSafeDistanceBackgroundColor(int uniBottomSafeDistanceBackgroundColor) {
-        this.uniBottomSafeDistanceBackgroundColor = uniBottomSafeDistanceBackgroundColor;
+    public void setUniBottomSafeDistanceBackgroundColor(int uniBottomSafeDistanceBackgroundColorValue) {
+        this.uniBottomSafeDistanceBackgroundColor = uniBottomSafeDistanceBackgroundColorValue;
     }
 
     /**

--
Gitblit v1.8.0