From ec1d7cb35b99f01be0151c5b6f0c0fc2fa30ab95 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 21 八月 2021 17:44:09 +0800
Subject: [PATCH] 安防功能
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 185 ++++++++++++++++++++++++----------------------
1 files changed, 97 insertions(+), 88 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 1ffbbce..2c0a039 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -85,18 +85,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>
@@ -286,21 +286,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()
{
@@ -445,36 +445,41 @@
};
residenceMemberView.AddChidren(btnResidenceMemberText);
#endregion
- #region ---瀹夋斁鍖哄煙
+ 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 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
+
#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
//{
@@ -539,9 +544,9 @@
#region ---娣诲姞鍔熻兘鍖哄煙
residenceAddFunctionView = new FrameLayout()
{
- X = residenceMemberView.Right,
- //X = Application.GetRealWidth(28 - 24),
- Y = Application.GetRealHeight(68),
+ //X = residenceMemberView.Right,
+ X = Application.GetRealWidth(28 - 24),
+ Y = residenceManageView.Bottom,
Width = Application.GetRealWidth(64 + 48),
Height = Application.GetRealWidth(64),
};
@@ -580,36 +585,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()
//{
--
Gitblit v1.8.0