From b13a98b48df67d902da843a3bd3d5659e3737d17 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 28 四月 2021 14:48:55 +0800
Subject: [PATCH] 优化地暖界面、音乐入口界面
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 05a6cf6..5587946 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -192,12 +192,12 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
+ Text = UserInfo.Current.userName// string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
};
personalInfoView.AddChidren(btnUserName);
- if (!string.IsNullOrEmpty( UserInfo.Current.userName))
+ if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
{
- btnUserName.Text = UserInfo.Current.userName; ;
+ btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
}
btnEmail = new Button()
{
@@ -294,7 +294,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = DB_ResidenceData.Instance.CurrentRegion.Name,
+ Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
IsBold = true
};
residenceInfoView.AddChidren(btnCurResidenceName);
@@ -339,7 +339,7 @@
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
-
+
if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
@@ -498,13 +498,13 @@
#region ---娣诲姞鍔熻兘鍖哄煙
residenceAddFunctionView = new FrameLayout()
{
- //X = residenceAuxiliaryFunctionView.Right,
- X = Application.GetRealWidth(28 - 24),
- Y = residenceManageView.Bottom,
+ X = residenceMemberView.Right,
+ //X = Application.GetRealWidth(28 - 24),
+ Y = Application.GetRealHeight(68),
Width = Application.GetRealWidth(64 + 48),
Height = Application.GetRealWidth(64),
};
- //residenceInfoView.AddChidren(residenceAddFunctionView);
+ residenceInfoView.AddChidren(residenceAddFunctionView);
btnResidenceAddFunctionIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
--
Gitblit v1.8.0