From 0bdc0a135dbe31761b53f432ed34f347f0a4e36b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 05 三月 2020 10:49:41 +0800
Subject: [PATCH] 20200304
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 159 ++++++++++++++++++++++++++--------------------------
1 files changed, 80 insertions(+), 79 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index b212a47..7370fc1 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -64,11 +64,11 @@
/// <summary>
/// 鍖哄煙绠＄悊灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceManageIcon;
+ Button btnResidenceManageIcon;
/// <summary>
/// 鍖哄煙绠＄悊灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceManageText;
+ Button btnResidenceManageText;
/// <summary>
/// 鍖哄煙鎴愬憳灏忓尯鍩�
/// </summary>
@@ -76,11 +76,11 @@
/// <summary>
/// 鍖哄煙鎴愬憳灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceMemberIcon;
+ Button btnResidenceMemberIcon;
/// <summary>
/// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceMemberText;
+ Button btnResidenceMemberText;
/// <summary>
/// 鍖哄煙瀹夋斁灏忓尯鍩�
/// </summary>
@@ -88,11 +88,11 @@
/// <summary>
/// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
/// </summary>
- Button residenceArmIcon;
+ Button btnResidenceArmIcon;
/// <summary>
/// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceArmText;
+ Button btnResidenceArmText;
/// <summary>
/// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩�
/// </summary>
@@ -100,11 +100,11 @@
/// <summary>
/// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceDataBackupIcon;
+ Button btnResidenceDataBackupIcon;
/// <summary>
/// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceDataBackupText;
+ Button btnResidenceDataBackupText;
/// <summary>
/// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩�
/// </summary>
@@ -112,11 +112,11 @@
/// <summary>
/// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceAuxiliaryFunctionIcon;
+ Button btnResidenceAuxiliaryFunctionIcon;
/// <summary>
/// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceAuxiliaryFunctionText;
+ Button btnResidenceAuxiliaryFunctionText;
/// <summary>
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩�
/// </summary>
@@ -124,11 +124,11 @@
/// <summary>
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceAddFunctionIcon;
+ Button btnResidenceAddFunctionIcon;
/// <summary>
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceAddFunctionText;
+ Button btnResidenceAddFunctionText;
/// <summary>
/// 杞欢璁剧疆鍖哄煙
/// </summary>
@@ -276,7 +276,7 @@
Height = Application.GetMinRealAverage(16),
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(25),
- UnSelectedImagePath = "0Common/DownIcon.png",
+ UnSelectedImagePath = "Public/DownIcon.png",
};
residenceInfoView.AddChidren(btnResidenceDownIcon);
@@ -334,12 +334,12 @@
{
X = Application.GetRealWidth(28 - 24),
Y = Application.GetRealHeight(68),
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealHeight(64),
};
residenceInfoView.AddChidren(residenceManageView);
- residenceManageIcon = new Button()
+ btnResidenceManageIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -347,30 +347,30 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/ResidenceManageIcon.png",
};
- residenceManageView.AddChidren(residenceManageIcon);
+ residenceManageView.AddChidren(btnResidenceManageIcon);
- residenceManageText = new Button()
+ btnResidenceManageText = new Button()
{
- Y = residenceManageIcon.Bottom,
+ Y = btnResidenceManageIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.ResidenceManage,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceManageView.AddChidren(residenceManageText);
+ residenceManageView.AddChidren(btnResidenceManageText);
#endregion
#region ---鎴愬憳鍖哄煙
residenceMemberView = new FrameLayout()
{
X = residenceManageView.Right,
Y = Application.GetRealHeight(68),
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealHeight(64),
};
residenceInfoView.AddChidren(residenceMemberView);
- residenceMemberIcon = new Button
+ btnResidenceMemberIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -378,28 +378,28 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/ResidenceMemberIcon.png",
};
- residenceMemberView.AddChidren(residenceMemberIcon);
- residenceMemberText = new Button()
+ residenceMemberView.AddChidren(btnResidenceMemberIcon);
+ btnResidenceMemberText = new Button()
{
- Y = residenceManageIcon.Bottom,
+ Y = btnResidenceManageIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.ResidenceMemberManage,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceMemberView.AddChidren(residenceMemberText);
+ residenceMemberView.AddChidren(btnResidenceMemberText);
#endregion
#region ---瀹夋斁鍖哄煙
residenceArmView = new FrameLayout()
{
X = residenceMemberView.Right,
Y = Application.GetRealHeight(68),
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealHeight(64),
};
residenceInfoView.AddChidren(residenceArmView);
- residenceArmIcon = new Button
+ btnResidenceArmIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -407,28 +407,28 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
};
- residenceArmView.AddChidren(residenceArmIcon);
- residenceArmText = new Button()
+ residenceArmView.AddChidren(btnResidenceArmIcon);
+ btnResidenceArmText = new Button()
{
- Y = residenceManageIcon.Bottom,
+ Y = btnResidenceManageIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.Undefense,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceArmView.AddChidren(residenceArmText);
+ residenceArmView.AddChidren(btnResidenceArmText);
#endregion
#region ---鏁版嵁澶囦唤鍖哄煙
residenceDataBackupView = new FrameLayout()
{
X = Application.GetRealWidth(28 - 24),
Y = residenceManageView.Bottom,
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
};
residenceInfoView.AddChidren(residenceDataBackupView);
- residenceDataBackupIcon = new Button
+ btnResidenceDataBackupIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -436,17 +436,17 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
};
- residenceDataBackupView.AddChidren(residenceDataBackupIcon);
- residenceDataBackupText = new Button()
+ residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
+ btnResidenceDataBackupText = new Button()
{
- Y = residenceManageIcon.Bottom,
+ Y = btnResidenceManageIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.DataBackup,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceDataBackupView.AddChidren(residenceDataBackupText);
+ residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
#endregion
#region ---杈呭姪鍔熻兘鍖哄煙
@@ -454,11 +454,11 @@
{
X = residenceDataBackupView.Right,
Y = residenceManageView.Bottom,
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
};
residenceInfoView.AddChidren(residenceAuxiliaryFunctionView);
- residenceAuxiliaryFunctionIcon = new Button
+ btnResidenceAuxiliaryFunctionIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -466,17 +466,17 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png",
};
- residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionIcon);
- residenceAuxiliaryFunctionText = new Button()
+ residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon);
+ btnResidenceAuxiliaryFunctionText = new Button()
{
- Y = residenceManageIcon.Bottom,
+ Y = btnResidenceManageIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.AuxiliaryFunction,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionText);
+ residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
#endregion
#region ---娣诲姞鍔熻兘鍖哄煙
@@ -484,11 +484,11 @@
{
X = residenceAuxiliaryFunctionView.Right,
Y = residenceManageView.Bottom,
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
};
residenceInfoView.AddChidren(residenceAddFunctionView);
- residenceAddFunctionIcon = new Button
+ btnResidenceAddFunctionIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -496,17 +496,17 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
};
- residenceAddFunctionView.AddChidren(residenceAddFunctionIcon);
- residenceAddFunctionText = new Button()
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
+ btnResidenceAddFunctionText = new Button()
{
- Y = residenceManageIcon.Bottom,
+ Y = btnResidenceManageIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.AddFunction,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceAddFunctionView.AddChidren(residenceAddFunctionText);
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
#endregion
}
else
@@ -516,11 +516,11 @@
{
X = Application.GetRealWidth(28 - 24),
Y = Application.GetRealHeight(68),
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
};
residenceInfoView.AddChidren(residenceArmView);
- residenceArmIcon = new Button
+ btnResidenceArmIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -528,28 +528,28 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
};
- residenceArmView.AddChidren(residenceArmIcon);
- residenceArmText = new Button()
+ residenceArmView.AddChidren(btnResidenceArmIcon);
+ btnResidenceArmText = new Button()
{
- Y = residenceArmIcon.Bottom,
+ Y = btnResidenceArmIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.Undefense,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceArmView.AddChidren(residenceArmText);
+ residenceArmView.AddChidren(btnResidenceArmText);
#endregion
#region ---鏁版嵁澶囦唤鍖哄煙
residenceDataBackupView = new FrameLayout()
{
X = residenceArmView.Right,
Y = Application.GetRealHeight(68),
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
};
residenceInfoView.AddChidren(residenceDataBackupView);
- residenceDataBackupIcon = new Button
+ btnResidenceDataBackupIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -557,17 +557,17 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
};
- residenceDataBackupView.AddChidren(residenceDataBackupIcon);
- residenceDataBackupText = new Button()
+ residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
+ btnResidenceDataBackupText = new Button()
{
- Y = residenceDataBackupIcon.Bottom,
+ Y = btnResidenceDataBackupIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.DataBackup,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceDataBackupView.AddChidren(residenceDataBackupText);
+ residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
#endregion
#region ---杈呭姪鍔熻兘鍖哄煙
@@ -575,11 +575,11 @@
{
X = residenceDataBackupView.Right,
Y = Application.GetRealHeight(68),
- Width = Application.GetMinRealAverage(64 + 48),
- Height = Application.GetMinRealAverage(64),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
};
residenceInfoView.AddChidren(residenceAuxiliaryFunctionView);
- residenceAuxiliaryFunctionIcon = new Button
+ btnResidenceAuxiliaryFunctionIcon = new Button
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(5),
@@ -587,17 +587,17 @@
Height = Application.GetMinRealAverage(30),
UnSelectedImagePath = "PersonalCenter/AuxiliaryFunctionIcon.png",
};
- residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionIcon);
- residenceAuxiliaryFunctionText = new Button()
+ residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionIcon);
+ btnResidenceAuxiliaryFunctionText = new Button()
{
- Y = residenceAuxiliaryFunctionIcon.Bottom,
+ Y = btnResidenceAuxiliaryFunctionIcon.Bottom,
Height = Application.GetRealHeight(29),
TextID = StringId.AuxiliaryFunction,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel
};
- residenceAuxiliaryFunctionView.AddChidren(residenceAuxiliaryFunctionText);
+ residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
#endregion
}
@@ -643,11 +643,12 @@
btnNightViewModeSwitch = new Button()
{
- X = Application.GetRealWidth(293),
+ X = Application.GetRealWidth(283),
Y = Application.GetRealHeight(4),
- Width = Application.GetMinRealAverage(36),
+ Width = Application.GetMinRealAverage(48),
Height = Application.GetMinRealAverage(36),
- UnSelectedImagePath = "PersonalCenter/SwitchClose.png",
+ UnSelectedImagePath = "Public/Switch.png",
+ SelectedImagePath = "Public/SwitchOn.png",
};
softSettingView.AddChidren(btnNightViewModeSwitch);
--
Gitblit v1.8.0