From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 284 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 163 insertions(+), 121 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 559faa4..8ad95c4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -84,19 +84,18 @@
/// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceMemberText;
- #region F3闃舵
- ///// <summary>
- ///// 鍖哄煙瀹夋斁灏忓尯鍩�
- ///// </summary>
- //FrameLayout residenceArmView;
- ///// <summary>
- ///// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
- ///// </summary>
- //Button btnResidenceArmIcon;
- ///// <summary>
- ///// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
- ///// </summary>
- //Button btnResidenceArmText;
+ /// <summary>
+ /// 鍖哄煙瀹夋斁灏忓尯鍩�
+ /// </summary>
+ FrameLayout residenceArmView;
+ /// <summary>
+ /// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
+ /// </summary>
+ Button btnResidenceArmIcon;
+ /// <summary>
+ /// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
+ /// </summary>
+ Button btnResidenceArmText;
///// <summary>
///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩�
///// </summary>
@@ -121,9 +120,7 @@
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceAddFunctionText;
- #endregion
- #region F3闃舵
///// <summary>
///// 杞欢璁剧疆鍖哄煙
///// </summary>
@@ -155,7 +152,6 @@
/// </summary>
Button btnSmartSpeakerText;
- #endregion
public PersonalCenterPage()
{
@@ -234,6 +230,42 @@
#endregion
+ //浣撻獙妯″紡
+ if(MainPage.NoLoginMode)
+ {
+ Button btnExit = new Button()
+ {
+ Y = Application.GetRealHeight(288) + personalInfoView.Bottom,
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(60),
+ Width = Application.GetRealWidth(330),
+ TextAlignment = TextAlignment.Center,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.NextStep,
+ Radius = 10,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ if(Language.CurrentLanguage =="Chinese")
+ {
+ btnExit.Text = "閫�鍑轰綋楠屾ā寮�";
+ }
+ else
+ {
+ btnExit.Text = "Exit dome";
+ }
+ btnExit.MouseUpEventHandler = (sender, e) =>
+ {
+ MainPage.NoLoginMode = false;
+ UserInfo.Current.ClearUserInfo();
+ HDLCommon.Current.Logout();
+ };
+ bodyView.AddChidren(btnExit);
+ return;
+ }
+
contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(8) + personalInfoView.Bottom,
@@ -250,21 +282,21 @@
contentView.RemoveAll();
#region 浣忓畢淇℃伅鍖哄煙
- //if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- //{
- // residenceInfoView = new FrameLayout()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Width = Application.GetRealWidth(343),
- // Height = Application.GetRealHeight(213),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- // Radius = (uint)Application.GetRealHeight(12),
- // BorderColor = 0x00FFFFFF,
- // BorderWidth = 0,
- // };
- // contentView.AddChidren(residenceInfoView);
- //}
- //else
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ residenceInfoView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(213),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 0,
+ };
+ contentView.AddChidren(residenceInfoView);
+ }
+ else
{
residenceInfoView = new FrameLayout()
{
@@ -409,36 +441,40 @@
};
residenceMemberView.AddChidren(btnResidenceMemberText);
#endregion
- #region ---瀹夋斁鍖哄煙
- #region F3闃舵
- //residenceArmView = new FrameLayout()
- //{
- // X = residenceMemberView.Right,
- // Y = Application.GetRealHeight(68),
- // Width = Application.GetRealWidth(64 + 48),
- // Height = Application.GetRealHeight(64),
- //};
- //residenceInfoView.AddChidren(residenceArmView);
- //btnResidenceArmIcon = new Button
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Y = Application.GetRealHeight(5),
- // Width = Application.GetMinRealAverage(30),
- // Height = Application.GetMinRealAverage(30),
- // UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
- //};
- //residenceArmView.AddChidren(btnResidenceArmIcon);
- //btnResidenceArmText = new Button()
- //{
- // Y = btnResidenceManageIcon.Bottom,
- // Height = Application.GetRealHeight(29),
- // TextID = StringId.Undefense,
- // TextAlignment = TextAlignment.Center,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- //};
- //residenceArmView.AddChidren(btnResidenceArmText);
- #endregion
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ #region ---瀹夋斁鍖哄煙
+ residenceArmView = new FrameLayout()
+ {
+ X = residenceMemberView.Right,
+ Y = Application.GetRealHeight(68),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealHeight(64),
+ };
+ residenceInfoView.AddChidren(residenceArmView);
+ btnResidenceArmIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+ SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
+ };
+ residenceArmView.AddChidren(btnResidenceArmIcon);
+ btnResidenceArmText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.Undefense,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceArmView.AddChidren(btnResidenceArmText);
+ #endregion
+ }
+
#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
//{
@@ -500,37 +536,39 @@
//residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
#endregion
- #region ---娣诲姞鍔熻兘鍖哄煙
- residenceAddFunctionView = new FrameLayout()
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
- X = residenceMemberView.Right,
- //X = Application.GetRealWidth(28 - 24),
- Y = Application.GetRealHeight(68),
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealWidth(64),
- };
- residenceInfoView.AddChidren(residenceAddFunctionView);
- btnResidenceAddFunctionIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
- };
- residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
- btnResidenceAddFunctionText = new Button()
- {
- Y = btnResidenceManageIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.AddFunction,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
- #endregion
- #endregion
+ #region ---娣诲姞鍔熻兘鍖哄煙
+ residenceAddFunctionView = new FrameLayout()
+ {
+ //X = residenceMemberView.Right,
+ X = Application.GetRealWidth(28 - 24),
+ Y = residenceManageView.Bottom,
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(residenceAddFunctionView);
+ btnResidenceAddFunctionIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
+ btnResidenceAddFunctionText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.AddFunction,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
+ #endregion
+ }
}
else
{
@@ -544,36 +582,40 @@
TextID = StringId.FunctionNotOpen,
});
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ #region ---瀹夋斁鍖哄煙
+ residenceArmView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(28 - 24),
+ Y = Application.GetRealHeight(68),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(residenceArmView);
+ btnResidenceArmIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+ SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
+ };
+ residenceArmView.AddChidren(btnResidenceArmIcon);
+ btnResidenceArmText = new Button()
+ {
+ Y = btnResidenceArmIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.Undefense,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceArmView.AddChidren(btnResidenceArmText);
+ #endregion
+ }
#region F3闃舵
- #region ---瀹夋斁鍖哄煙
- //residenceArmView = new FrameLayout()
- //{
- // X = Application.GetRealWidth(28 - 24),
- // Y = Application.GetRealHeight(68),
- // Width = Application.GetRealWidth(64 + 48),
- // Height = Application.GetRealWidth(64),
- //};
- //residenceInfoView.AddChidren(residenceArmView);
- //btnResidenceArmIcon = new Button
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Y = Application.GetRealHeight(5),
- // Width = Application.GetMinRealAverage(30),
- // Height = Application.GetMinRealAverage(30),
- // UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
- //};
- //residenceArmView.AddChidren(btnResidenceArmIcon);
- //btnResidenceArmText = new Button()
- //{
- // Y = btnResidenceArmIcon.Bottom,
- // Height = Application.GetRealHeight(29),
- // TextID = StringId.Undefense,
- // TextAlignment = TextAlignment.Center,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- //};
- //residenceArmView.AddChidren(btnResidenceArmText);
- #endregion
#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
//{
@@ -750,7 +792,7 @@
#region 鏅鸿兘闊崇
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
//supportView 鍔犻珮 鏄剧ず3琛� 3*44
supportView.Height = Application.GetRealWidth(3*44);
--
Gitblit v1.8.0