From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 107 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 61 insertions(+), 46 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 4d22aef..df6caf4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -109,18 +109,18 @@
///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熸枃鏈�
///// </summary>
//Button btnResidenceAuxiliaryFunctionText;
- ///// <summary>
- ///// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩�
- ///// </summary>
- //FrameLayout residenceAddFunctionView;
- ///// <summary>
- ///// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熷浘鏍�
- ///// </summary>
- //Button btnResidenceAddFunctionIcon;
- ///// <summary>
- ///// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
- ///// </summary>
- //Button btnResidenceAddFunctionText;
+ /// <summary>
+ /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩�
+ /// </summary>
+ FrameLayout residenceAddFunctionView;
+ /// <summary>
+ /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熷浘鏍�
+ /// </summary>
+ Button btnResidenceAddFunctionIcon;
+ /// <summary>
+ /// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
+ /// </summary>
+ Button btnResidenceAddFunctionText;
#endregion
#region F3闃舵
@@ -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()
{
@@ -244,7 +244,6 @@
{
contentView.RemoveAll();
- #region F3闃舵
#region 浣忓畢淇℃伅鍖哄煙
//if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
//{
@@ -261,7 +260,6 @@
// contentView.AddChidren(residenceInfoView);
//}
//else
- #endregion
{
residenceInfoView = new FrameLayout()
{
@@ -310,6 +308,12 @@
BackgroundImagePath = "PersonalCenter/UserTypebg.png",
};
residenceInfoView.AddChidren(userTypeView);
+ if (Language.CurrentLanguage != "Chinese" && !DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ userTypeView.X = Application.GetRealWidth(200);
+ userTypeView.Width = Application.GetRealWidth(180);
+ userTypeView.BackgroundImagePath = "PersonalCenter/UserTypebg2.png";
+ }
btnUserTypeIcon = new Button()
{
@@ -321,11 +325,10 @@
== false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
};
userTypeView.AddChidren(btnUserTypeIcon);
-
btnUserTypeName = new Button()
{
X = Application.GetRealWidth(8) + btnUserTypeIcon.Right,
- Width = Application.GetRealWidth(80),
+ Width = Application.GetRealWidth(270),
Height = Application.GetRealHeight(17 * 3),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
@@ -336,6 +339,7 @@
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
+
if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
@@ -492,38 +496,49 @@
#endregion
#region ---娣诲姞鍔熻兘鍖哄煙
- //residenceAddFunctionView = new FrameLayout()
- //{
- // X = residenceAuxiliaryFunctionView.Right,
- // Y = residenceManageView.Bottom,
- // Width = Application.GetRealWidth(64 + 48),
- // Height = Application.GetRealWidth(64),
- //};
- //residenceInfoView.AddChidren(residenceAddFunctionView);
- //btnResidenceAddFunctionIcon = new Button
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Y = Application.GetRealHeight(5),
- // Width = Application.GetMinRealAverage(30),
- // Height = Application.GetMinRealAverage(30),
- // UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
- //};
- //residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
- //btnResidenceAddFunctionText = new Button()
- //{
- // Y = btnResidenceManageIcon.Bottom,
- // Height = Application.GetRealHeight(29),
- // TextID = StringId.AddFunction,
- // TextAlignment = TextAlignment.Center,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- //};
- //residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
+ residenceAddFunctionView = new FrameLayout()
+ {
+ X = residenceMemberView.Right,
+ //X = Application.GetRealWidth(28 - 24),
+ Y = Application.GetRealHeight(68),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(residenceAddFunctionView);
+ btnResidenceAddFunctionIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
+ btnResidenceAddFunctionText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.AddFunction,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
#endregion
#endregion
}
else
{
+ residenceInfoView.AddChidren(new Button()
+ {
+ Y = Application.GetRealHeight(20 + 42),
+ Height = Application.GetRealHeight(40),
+ TextAlignment = TextAlignment.Center,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextID = StringId.FunctionNotOpen,
+ });
+
#region F3闃舵
#region ---瀹夋斁鍖哄煙
//residenceArmView = new FrameLayout()
--
Gitblit v1.8.0