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 | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 7305feb..df6caf4 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()
{
@@ -337,11 +337,6 @@
== false ? StringId.Administrators : StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
- btnUserTypeIcon.MouseUpEventHandler += (sender, e) =>
- {
- var form = new AddThirdPartyDeviceMenuListPage();
- form.AddForm("Evoyo");
- };
#endregion
#region 浣忓畢绠＄悊
@@ -503,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