From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 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 d1e689c..cd1a8ea 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -36,6 +36,9 @@
return sUserConfigManage;
}
+
+ //uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
+ private int uniBottomSafeDistanceBackgroundColor;
//褰撳墠璐﹀彿锛氬埛鏂癟oken鐢ㄧ殑token(涓嶇敤璁板綍浠�涔堟湁鏁堟湡,濡傛灉鍒锋柊澶辫触,灏辫涪浜哄嵆鍙�)
private String refreshToken;
//璐︽埛鐧诲綍鎴愬姛鏃剁殑鏃堕棿
@@ -93,7 +96,7 @@
//鐢ㄦ埛澶村儚
- private String userImageUrl;
+ private String userImageUrl = "/static/image/user-default-head.png";
/// <summary>
@@ -106,7 +109,7 @@
public String pushId;
public String getUserImageUrl() {
- return userImageUrl == null ? "" : userImageUrl;
+ return userImageUrl == null ? "/static/image/user-default-head.png" : userImageUrl;
}
public void setUserImageUrl(String userImageUrl) {
@@ -296,6 +299,24 @@
}
/**
+ * uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
+ *
+ * @return 鍊�
+ */
+ public int getUniBottomSafeDistanceBackgroundColor() {
+ return this.uniBottomSafeDistanceBackgroundColor;
+ }
+
+ /**
+ * uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
+ *
+ * @param uniBottomSafeDistanceBackgroundColorValue 锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛�
+ */
+ public void setUniBottomSafeDistanceBackgroundColor(int uniBottomSafeDistanceBackgroundColorValue) {
+ this.uniBottomSafeDistanceBackgroundColor = uniBottomSafeDistanceBackgroundColorValue;
+ }
+
+ /**
* 褰撳墠浣忓畢
*/
private HouseInfoBean m_Home = null;
--
Gitblit v1.8.0