From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 7a6332d..7305feb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -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,
@@ -334,9 +337,14 @@
== false ? StringId.Administrators : StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
+ btnUserTypeIcon.MouseUpEventHandler += (sender, e) =>
+ {
+ var form = new AddThirdPartyDeviceMenuListPage();
+ form.AddForm("Evoyo");
+ };
#endregion
#region 浣忓畢绠＄悊
-
+
if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
@@ -495,12 +503,13 @@
#region ---娣诲姞鍔熻兘鍖哄煙
residenceAddFunctionView = new FrameLayout()
{
- X = residenceAuxiliaryFunctionView.Right,
+ //X = residenceAuxiliaryFunctionView.Right,
+ X = Application.GetRealWidth(28 - 24),
Y = residenceManageView.Bottom,
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