From b9cc7390e8e8ce64c41c26fb369c98ce669d660c Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期三, 07 五月 2025 15:02:30 +0800 Subject: [PATCH] Merge branch '1.2.0' --- app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 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 6602b66..cd1a8ea 100644 --- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java +++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java @@ -9,6 +9,7 @@ import com.hdl.photovoltaic.other.HdlLogLogic; import com.hdl.photovoltaic.other.HdlResidenceLogic; import com.hdl.photovoltaic.ui.bean.HouseInfoBean; +import com.hdl.photovoltaic.utils.LocalManageUtil; import com.hdl.photovoltaic.utils.SharedPreUtils; import java.util.ArrayList; @@ -35,6 +36,9 @@ return sUserConfigManage; } + + //uni涓�绾х晫闈㈢殑瀹夊叏璺濈鑳屾櫙棰滆壊锛�0=鐢电珯璇︽儏鐣岄潰锛�1=娣诲姞鐢电珯鐣岄潰锛�2=璁惧璋冩祴鐣岄潰锛� + private int uniBottomSafeDistanceBackgroundColor; //褰撳墠璐﹀彿锛氬埛鏂癟oken鐢ㄧ殑token(涓嶇敤璁板綍浠�涔堟湁鏁堟湡,濡傛灉鍒锋柊澶辫触,灏辫涪浜哄嵆鍙�) private String refreshToken; //璐︽埛鐧诲綍鎴愬姛鏃剁殑鏃堕棿 @@ -91,6 +95,10 @@ private String currentAppLanguage; + //鐢ㄦ埛澶村儚 + private String userImageUrl = "/static/image/user-default-head.png"; + + /// <summary> /// 娉ㄥ唽鏋佸厜ID /// </summary> @@ -100,6 +108,13 @@ /// </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; @@ -284,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; @@ -334,5 +367,14 @@ // SharedPreUtils.saveMyDataInfo("UserConfigManage.json", json, HDLApp.getInstance()); } + /** + * true琛ㄧず鏄腑鏂� + * + * @return true琛ㄧず鏄腑鏂� + */ + public boolean isZh() { + return currentAppLanguage.equals(LocalManageUtil.zh); + } + } -- Gitblit v1.8.0