From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 7a6332d..05a6cf6 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,
@@ -495,12 +498,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