From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 201 ++++++++++++++++++++++++++------------------------
1 files changed, 104 insertions(+), 97 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index b212a47..f3ccc06 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -1,7 +1,6 @@
-锘縰sing System;
-using Shared;
+锘縰sing Shared;
using HDL_ON.UI.CSS;
-using HDL_ON.UI;
+using HDL_ON.Entity;
namespace HDL_ON.UI
{
@@ -32,7 +31,7 @@
/// <summary>
/// 鐢ㄦ埛澶村儚
/// </summary>
- Button btnUserHeadPortrait;
+ ImageView userHeadImageView;
/// <summary>
/// 浣忓畢淇℃伅鍖哄煙
/// </summary>
@@ -54,7 +53,7 @@
/// </summary>
Button btnUserTypeIcon;
/// <summary>
- /// 鐢ㄦ埛绫诲瀷鍥炬爣
+ /// 鐢ㄦ埛绫诲瀷鍚嶇О
/// </summary>
Button btnUserTypeName;
/// <summary>
@@ -64,11 +63,11 @@
/// <summary>
/// 鍖哄煙绠＄悊灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceManageIcon;
+ Button btnResidenceManageIcon;
/// <summary>
/// 鍖哄煙绠＄悊灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceManageText;
+ Button btnResidenceManageText;
/// <summary>
/// 鍖哄煙鎴愬憳灏忓尯鍩�
/// </summary>
@@ -76,11 +75,11 @@
/// <summary>
/// 鍖哄煙鎴愬憳灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceMemberIcon;
+ Button btnResidenceMemberIcon;
/// <summary>
/// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceMemberText;
+ Button btnResidenceMemberText;
/// <summary>
/// 鍖哄煙瀹夋斁灏忓尯鍩�
/// </summary>
@@ -88,11 +87,11 @@
/// <summary>
/// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
/// </summary>
- Button residenceArmIcon;
+ Button btnResidenceArmIcon;
/// <summary>
/// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceArmText;
+ Button btnResidenceArmText;
/// <summary>
/// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩�
/// </summary>
@@ -100,11 +99,11 @@
/// <summary>
/// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceDataBackupIcon;
+ Button btnResidenceDataBackupIcon;
/// <summary>
/// 鍖哄煙鏁版嵁澶囦唤灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceDataBackupText;
+ Button btnResidenceDataBackupText;
/// <summary>
/// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩�
/// </summary>
@@ -112,11 +111,11 @@
/// <summary>
/// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceAuxiliaryFunctionIcon;
+ Button btnResidenceAuxiliaryFunctionIcon;
/// <summary>
/// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceAuxiliaryFunctionText;
+ Button btnResidenceAuxiliaryFunctionText;
/// <summary>
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩�
/// </summary>
@@ -124,11 +123,11 @@
/// <summary>
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熷浘鏍�
/// </summary>
- Button residenceAddFunctionIcon;
+ Button btnResidenceAddFunctionIcon;
/// <summary>
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
- Button residenceAddFunctionText;
+ Button btnResidenceAddFunctionText;
/// <summary>
/// 杞欢璁剧疆鍖哄煙
/// </summary>
@@ -206,12 +205,13 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = string.IsNullOrEmpty(MainPage.LoginUser.UserName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.UserName
+ Text = string.IsNullOrEmpty(MainPage.LoginUser.userName) ? "涓嶆効鎰忛�忛湶濮撳悕鐨勭敤鎴�" : MainPage.LoginUser.userName
+
};
personalInfoView.AddChidren(btnUserName);
- if (!string.IsNullOrEmpty(MainPage.LoginUser.UserName))
+ if (!string.IsNullOrEmpty(MainPage.LoginUser.userName))
{
- btnUserName.Text = MainPage.LoginUser.UserName;
+ btnUserName.Text = MainPage.LoginUser.userName;;
}
btnEmail = new Button()
{
@@ -220,25 +220,32 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.LoginUser.AccountString
+ Text = MainPage.LoginUser.accountString
};
personalInfoView.AddChidren(btnEmail);
- btnUserHeadPortrait = new Button()
+ userHeadImageView = new ImageView()
{
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(51),
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
Radius = (uint)Application.GetMinRealAverage(42),
- UnSelectedImagePath = "LoginIcon/2.png"
+ ImagePath = MainPage.LoginUser.headImagePagePath
};
- bodyView.AddChidren(btnUserHeadPortrait);
+ bodyView.AddChidren(userHeadImageView);
+ //if ( MainPage.LoginUser.headImagePageBytes==null)
+ //{
+ // userHeadImageView.ImagePath = MainPage.LoginUser.headImagePagePath;
+ //}else
+ //{
+ // userHeadImageView.ImageBytes = MainPage.LoginUser.headImagePageBytes;
+ //}
#endregion
#region 浣忓畢淇℃伅鍖哄煙
- if (MainPage.LoginUser.AccountType == 0)
+ if (MainPage.LoginUser.accountType == 0)
{
residenceInfoView = new FrameLayout()
{
@@ -276,7 +283,7 @@
Height = Application.GetMinRealAverage(16),
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(25),
- UnSelectedImagePath = "0Common/DownIcon.png",
+ UnSelectedImagePath = "Public/DownIcon.png",
};
residenceInfoView.AddChidren(btnResidenceDownIcon);
@@ -289,10 +296,9 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = UserConfig.Instance.CurrentRegion.Name,
+ Text = DB_ResidenceData.residenceData.residecenInfo.Name,
};
residenceInfoView.AddChidren(btnCurResidenceName);
-
userTypeView = new FrameLayout()
{
@@ -310,7 +316,7 @@
Y = Application.GetRealHeight(15),
Width = Application.GetMinRealAverage(20),
Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = MainPage.LoginUser.AccountType == 0 ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
+ UnSelectedImagePath = MainPage.LoginUser.accountType == 0 ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
};
userTypeView.AddChidren(btnUserTypeIcon);
@@ -322,24 +328,24 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = MainPage.LoginUser.AccountType == 0 ? "绠＄悊鍛�" : "鎴愬憳"
+ Text = MainPage.LoginUser.accountType == 0 ? "绠＄悊鍛�" : "鎴愬憳"
};
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
- if (MainPage.LoginUser.AccountType == 0)
+ if (MainPage.LoginUser.accountType == 0)
{
#region ---浣忓畢绠＄悊鍖哄煙
residenceManageView = new FrameLayout()
{
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 +353,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 +384,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 +413,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 +442,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 +460,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 +472,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 +490,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 +502,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 +522,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 +534,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 +563,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 +581,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 +593,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 +649,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