From f6fd8acd7c53c44187e70b4709443318a628f4b5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 16 六月 2020 13:12:33 +0800
Subject: [PATCH] 2020-06-016
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 147 +++++++++++++++++++++++++------------------------
1 files changed, 75 insertions(+), 72 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index f3ccc06..1df7c54 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -92,18 +92,18 @@
/// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceArmText;
- /// <summary>
- /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩�
- /// </summary>
- FrameLayout residenceDataBackupView;
- /// <summary>
- /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熷浘鏍�
- /// </summary>
- Button btnResidenceDataBackupIcon;
- /// <summary>
- /// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熸枃鏈�
- /// </summary>
- Button btnResidenceDataBackupText;
+ ///// <summary>
+ ///// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩�
+ ///// </summary>
+ //FrameLayout residenceDataBackupView;
+ ///// <summary>
+ ///// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熷浘鏍�
+ ///// </summary>
+ //Button btnResidenceDataBackupIcon;
+ ///// <summary>
+ ///// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熸枃鏈�
+ ///// </summary>
+ //Button btnResidenceDataBackupText;
/// <summary>
/// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩�
/// </summary>
@@ -245,7 +245,7 @@
#endregion
#region 浣忓畢淇℃伅鍖哄煙
- if (MainPage.LoginUser.accountType == 0)
+ if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
{
residenceInfoView = new FrameLayout()
{
@@ -316,7 +316,8 @@
Y = Application.GetRealHeight(15),
Width = Application.GetMinRealAverage(20),
Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = MainPage.LoginUser.accountType == 0 ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
+ UnSelectedImagePath = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+ == false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
};
userTypeView.AddChidren(btnUserTypeIcon);
@@ -328,12 +329,13 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.LoginUser.accountType == 0 ? "绠＄悊鍛�" : "鎴愬憳"
+ Text = DB_ResidenceData.residenceData.residecenInfo.IsOthreShare
+ == false ? "绠＄悊鍛�" : "鎴愬憳"
};
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
- if (MainPage.LoginUser.accountType == 0)
+ if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
residenceManageView = new FrameLayout()
@@ -426,39 +428,40 @@
residenceArmView.AddChidren(btnResidenceArmText);
#endregion
#region ---鏁版嵁澶囦唤鍖哄煙
- residenceDataBackupView = new FrameLayout()
- {
- X = Application.GetRealWidth(28 - 24),
- Y = residenceManageView.Bottom,
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealWidth(64),
- };
- residenceInfoView.AddChidren(residenceDataBackupView);
- btnResidenceDataBackupIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
- };
- residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
- btnResidenceDataBackupText = new Button()
- {
- Y = btnResidenceManageIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.DataBackup,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
+ //residenceDataBackupView = new FrameLayout()
+ //{
+ // X = Application.GetRealWidth(28 - 24),
+ // Y = residenceManageView.Bottom,
+ // Width = Application.GetRealWidth(64 + 48),
+ // Height = Application.GetRealWidth(64),
+ //};
+ //residenceInfoView.AddChidren(residenceDataBackupView);
+ //btnResidenceDataBackupIcon = new Button
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(5),
+ // Width = Application.GetMinRealAverage(30),
+ // Height = Application.GetMinRealAverage(30),
+ // UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
+ //};
+ //residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
+ //btnResidenceDataBackupText = new Button()
+ //{
+ // Y = btnResidenceManageIcon.Bottom,
+ // Height = Application.GetRealHeight(29),
+ // TextID = StringId.DataBackup,
+ // TextAlignment = TextAlignment.Center,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ //};
+ //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
#endregion
#region ---杈呭姪鍔熻兘鍖哄煙
residenceAuxiliaryFunctionView = new FrameLayout()
{
- X = residenceDataBackupView.Right,
+ X = Application.GetRealWidth(28 - 24),
+ //X = residenceDataBackupView.Right,
Y = residenceManageView.Bottom,
Width = Application.GetRealWidth(64 + 48),
Height = Application.GetRealWidth(64),
@@ -547,39 +550,39 @@
residenceArmView.AddChidren(btnResidenceArmText);
#endregion
#region ---鏁版嵁澶囦唤鍖哄煙
- residenceDataBackupView = new FrameLayout()
- {
- X = residenceArmView.Right,
- Y = Application.GetRealHeight(68),
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealWidth(64),
- };
- residenceInfoView.AddChidren(residenceDataBackupView);
- btnResidenceDataBackupIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
- };
- residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
- btnResidenceDataBackupText = new Button()
- {
- Y = btnResidenceDataBackupIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.DataBackup,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
+ //residenceDataBackupView = new FrameLayout()
+ //{
+ // X = residenceArmView.Right,
+ // Y = Application.GetRealHeight(68),
+ // Width = Application.GetRealWidth(64 + 48),
+ // Height = Application.GetRealWidth(64),
+ //};
+ //residenceInfoView.AddChidren(residenceDataBackupView);
+ //btnResidenceDataBackupIcon = new Button
+ //{
+ // Gravity = Gravity.CenterHorizontal,
+ // Y = Application.GetRealHeight(5),
+ // Width = Application.GetMinRealAverage(30),
+ // Height = Application.GetMinRealAverage(30),
+ // UnSelectedImagePath = "PersonalCenter/ResidenceDataBackupIcon.png",
+ //};
+ //residenceDataBackupView.AddChidren(btnResidenceDataBackupIcon);
+ //btnResidenceDataBackupText = new Button()
+ //{
+ // Y = btnResidenceDataBackupIcon.Bottom,
+ // Height = Application.GetRealHeight(29),
+ // TextID = StringId.DataBackup,
+ // TextAlignment = TextAlignment.Center,
+ // TextColor = CSS_Color.FirstLevelTitleColor,
+ // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ //};
+ //residenceDataBackupView.AddChidren(btnResidenceDataBackupText);
#endregion
#region ---杈呭姪鍔熻兘鍖哄煙
residenceAuxiliaryFunctionView = new FrameLayout()
{
- X = residenceDataBackupView.Right,
+ X = residenceArmView.Right,
Y = Application.GetRealHeight(68),
Width = Application.GetRealWidth(64 + 48),
Height = Application.GetRealWidth(64),
--
Gitblit v1.8.0