From ffdeae1a43e1539f9533f93d64089994db6c742b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:23:01 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 229 ++++++++++++++++++++++++++++----------------------------
1 files changed, 114 insertions(+), 115 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index d285fbb..ee17871 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -57,33 +57,32 @@
/// </summary>
Button btnCommissioningAuthoritySwitchIcon;
- #region F3闃舵
#region 绠＄悊鍛樻潈闄愯縼绉�
- //FrameLayout administratorPermissionMigrationRow;
- //Button btnAdministratorPermissionMigrationTitle;
- //Button btnAdministratorPermissionMigrationExplan;
- //Button btnAdministratorPermissionMigrationSkinIcon;
+ FrameLayout administratorPermissionMigrationRow;
+ Button btnAdministratorPermissionMigrationTitle;
+ Button btnAdministratorPermissionMigrationExplan;
+ Button btnAdministratorPermissionMigrationSkinIcon;
#endregion
#region 杩囨埛
- ///// <summary>
- /////
- ///// </summary>
- //FrameLayout transferRow;
- ///// <summary>
- /////
- ///// </summary>
- //Button btnTransferTitle;
- ///// <summary>
- /////
- ///// </summary>
- //Button btnTrasferExplan;
- ///// <summary>
- /////
- ///// </summary>
- //Button btnTrasferSkinIcon;
+ /// <summary>
+ ///
+ /// </summary>
+ FrameLayout transferRow;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTransferTitle;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTrasferExplan;
+ /// <summary>
+ ///
+ /// </summary>
+ Button btnTrasferSkinIcon;
#endregion
- #endregion
+
#endregion
/// <summary>
/// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁�
@@ -276,112 +275,112 @@
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
#endregion
-
- #region F3闃舵
#region 绠＄悊鍛樻潈闄愯縼绉�
- //contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
- //administratorPermissionMigrationRow = new FrameLayout()
- //{
- // Height = Application.GetRealHeight(65),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- //};
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+ administratorPermissionMigrationRow = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(65),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
//contentView.AddChidren(administratorPermissionMigrationRow);
- //btnAdministratorPermissionMigrationTitle = new Button()
- //{
- // X = Application.GetRealWidth(16),
- // Y = Application.GetRealHeight(10),
- // Width = Application.GetRealWidth(308),
- // Height = Application.GetRealHeight(24),
- // TextID = StringId.AdministratorPermissionMigration,
- // TextAlignment = TextAlignment.CenterLeft,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- //};
- //administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);
+ btnAdministratorPermissionMigrationTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(308),
+ Height = Application.GetRealHeight(24),
+ TextID = StringId.AdministratorPermissionMigration,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);
- //btnAdministratorPermissionMigrationExplan = new Button()
- //{
- // X = Application.GetRealWidth(16),
- // Y = btnAdministratorPermissionMigrationTitle.Bottom,
- // Width = Application.GetRealWidth(308),
- // Height = Application.GetRealHeight(21),
- // TextID = StringId.AdministratorPermissionMigrationExPlan,
- // TextAlignment = TextAlignment.CenterLeft,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextColor = CSS_Color.PromptingColor1,
- //};
- //administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);
+ btnAdministratorPermissionMigrationExplan = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnAdministratorPermissionMigrationTitle.Bottom,
+ Width = Application.GetRealWidth(308),
+ Height = Application.GetRealHeight(21),
+ TextID = StringId.AdministratorPermissionMigrationExPlan,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ };
+ administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);
- //btnAdministratorPermissionMigrationSkinIcon = new Button()
- //{
- // X = Application.GetRealWidth(343),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/RightIcon.png",
- //};
- //administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationSkinIcon);
+ btnAdministratorPermissionMigrationSkinIcon = new Button()
+ {
+ X = Application.GetRealWidth(343),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/RightIcon.png",
+ };
+ administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationSkinIcon);
- //administratorPermissionMigrationRow.AddChidren(
- // new Button()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Y = Application.GetRealHeight(64),
- // Height = Application.GetRealHeight(1),
- // Width = Application.GetRealWidth(343),
- // BackgroundColor = CSS_Color.DividingLineColor,
- // });
- #endregion
+ administratorPermissionMigrationRow.AddChidren(
+ new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(1),
+ Width = Application.GetRealWidth(343),
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
#endregion
- #region F3闃舵
#region 杩囨埛
- //transferRow = new FrameLayout()
- //{
- // Y = administratorPermissionMigrationRow.Bottom,
- // Height = Application.GetRealHeight(65),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- //};
- //contentView.AddChidren(transferRow);
+ transferRow = new FrameLayout()
+ {
+ Y = administratorPermissionMigrationRow.Bottom,
+ Height = Application.GetRealHeight(65),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ //鏈夌綉鍏虫墠鑳借繃鎴�
+ if (DB_ResidenceData.Instance.HomeGateway != null && string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) == false
+ && DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
+ {
+ contentView.AddChidren(transferRow);
+ }
- //btnTransferTitle = new Button()
- //{
- // X = Application.GetRealWidth(16),
- // Y = Application.GetRealHeight(10),
- // Width = Application.GetRealWidth(308),
- // Height = Application.GetRealHeight(24),
- // TextID = StringId.Transfer,
- // TextAlignment = TextAlignment.CenterLeft,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- //};
- //transferRow.AddChidren(btnTransferTitle);
+ btnTransferTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = Application.GetRealHeight(10),
+ Width = Application.GetRealWidth(308),
+ Height = Application.GetRealHeight(24),
+ TextID = StringId.Transfer,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ transferRow.AddChidren(btnTransferTitle);
- //btnTrasferExplan = new Button()
- //{
- // X = Application.GetRealWidth(16),
- // Y = btnTransferTitle.Bottom,
- // Width = Application.GetRealWidth(308),
- // Height = Application.GetRealHeight(21),
- // TextID = StringId.TransferExPlan,
- // TextAlignment = TextAlignment.CenterLeft,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // TextColor = CSS_Color.PromptingColor1,
- //};
- //transferRow.AddChidren(btnTrasferExplan);
+ btnTrasferExplan = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Y = btnTransferTitle.Bottom,
+ Width = Application.GetRealWidth(308),
+ Height = Application.GetRealHeight(21),
+ TextID = StringId.TransferExPlan,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextColor = CSS_Color.PromptingColor1,
+ };
+ transferRow.AddChidren(btnTrasferExplan);
- //btnTrasferSkinIcon = new Button()
- //{
- // X = Application.GetRealWidth(343),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/RightIcon.png",
- //};
- //transferRow.AddChidren(btnTrasferSkinIcon);
- #endregion
+ btnTrasferSkinIcon = new Button()
+ {
+ X = Application.GetRealWidth(343),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/RightIcon.png",
+ };
+ transferRow.AddChidren(btnTrasferSkinIcon);
#endregion
#region 璋冭瘯鏉冮檺
--
Gitblit v1.8.0