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/RoomListManage/ResidentialManagePage.cs | 206 ++++++++++++++++++++++++++++++++-------------------
1 files changed, 129 insertions(+), 77 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index fa90b58..849be74 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -57,6 +57,32 @@
/// </summary>
Button btnCommissioningAuthoritySwitchIcon;
+ #region 绠＄悊鍛樻潈闄愯縼绉�
+ 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;
+ #endregion
+
#endregion
/// <summary>
/// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁�
@@ -71,20 +97,27 @@
public void LoadPage()
{
-
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
-
new TopViewDiv(bodyView, Language.StringByID(StringId.ResidenceManage)).LoadTopView();
- //new PublicAssmebly().LoadTopView(bodyView, Language.StringByID(StringId.ResidenceManage));
+
+ VerticalScrolViewLayout contentView = new VerticalScrolViewLayout()
+ {
+ Y = Application.GetRealHeight(64),
+ Height = Application.GetRealHeight(667 - 64),
+ ScrollEnabled = false,
+ };
+ bodyView.AddChidren(contentView);
+
#region 浣忓畢鍚嶇О
FrameLayout residenceNameRow;
- residenceNameRow = new FrameLayout() {
+ residenceNameRow = new FrameLayout()
+ {
Y = Application.GetRealHeight(72),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(residenceNameRow);
+ contentView.AddChidren(residenceNameRow);
Button btnResidenceNameTitle = new Button()
{
X = Application.GetRealWidth(16),
@@ -98,9 +131,9 @@
btnResidenceName = new Button()
{
- X = Application.GetRealWidth(2)+ btnResidenceNameTitle.Right,
+ X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
Width = Application.GetRealWidth(200),
- Text = DB_ResidenceData.residenceData.residecenInfo.Name,
+ Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
@@ -118,7 +151,6 @@
residenceNameRow.AddChidren(btnEditResidenceNameIcon);
#endregion
-#if stage2
residenceNameRow.AddChidren(
new Button()
{
@@ -129,55 +161,56 @@
BackgroundColor = CSS_Color.DividingLineColor,
});
#region 浣忓畢鍦板潃
- var residenceAddressRow = new FrameLayout()
- {
- Y = residenceNameRow.Bottom,
- Height = Application.GetRealHeight(50),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(residenceAddressRow);
-
- var btnResidenceAddressTitle = new Button()
- {
- X = Application.GetRealWidth(16),
- Width = Application.GetRealWidth(78),
- TextID = StringId.ResidenceAddress,
- TextAlignment = TextAlignment.CenterLeft,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextColor = CSS_Color.FirstLevelTitleColor,
- };
- residenceAddressRow.AddChidren(btnResidenceAddressTitle);
-
- btnLocationAddressIcon = new Button()
- {
- X = Application.GetRealWidth(333),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(28),
- Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "Public/LocationAddressIcon.png",
- };
- residenceAddressRow.AddChidren(btnLocationAddressIcon);
-
- btnResidenceAddress = new Button()
- {
- X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
- Width = Application.GetRealWidth(200),
- Text = DB_ResidenceData.residenceData.residecenInfo.Address,
- TextSize = CSS_FontSize.TextFontSize,
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.TextualColor,
- };
- residenceAddressRow.AddChidren(btnResidenceAddress);
- #endregion
-#endif
- #region 妤煎眰绠＄悊
- floorManagementRow = new FrameLayout()
+ var residenceAddressRow = new FrameLayout()
{
- Y = Application.GetRealHeight(8) + residenceNameRow.Bottom,// residenceAddressRow.Bottom,
+ Y = residenceNameRow.Bottom,
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(floorManagementRow);
+ contentView.AddChidren(residenceAddressRow);
+
+ var btnResidenceAddressTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(78),
+ TextID = StringId.ResidenceAddress,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ residenceAddressRow.AddChidren(btnResidenceAddressTitle);
+
+ btnLocationAddressIcon = new Button()
+ {
+ X = Application.GetRealWidth(333),
+ Gravity = Gravity.CenterVertical,
+ Width = Application.GetMinRealAverage(28),
+ Height = Application.GetMinRealAverage(28),
+ //UnSelectedImagePath = "Public/LocationAddressIcon.png",
+ UnSelectedImagePath = "Public/Edit.png",
+ };
+ residenceAddressRow.AddChidren(btnLocationAddressIcon);
+
+ btnResidenceAddress = new Button()
+ {
+ X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
+ Width = Application.GetRealWidth(200),
+ Text = DB_ResidenceData.Instance.CurrentRegion.homeAddress,
+ TextSize = CSS_FontSize.TextFontSize,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.TextualColor,
+ };
+ residenceAddressRow.AddChidren(btnResidenceAddress);
+ #endregion
+ #region 妤煎眰绠＄悊
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+
+ floorManagementRow = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(floorManagementRow);
btnFloorManagementTitle = new Button()
{
@@ -209,16 +242,16 @@
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
});
-#endregion
+ #endregion
-#region 鎴块棿绠＄悊
+ #region 鎴块棿绠＄悊
roomManagementRow = new FrameLayout()
{
Y = floorManagementRow.Bottom,
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(roomManagementRow);
+ contentView.AddChidren(roomManagementRow);
btnRoomManagementTitle = new Button()
{
@@ -240,19 +273,22 @@
UnSelectedImagePath = "Public/RightIcon.png",
};
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
-#endregion
+ #endregion
-#region 绠＄悊鍛樻潈闄愯縼绉�
- FrameLayout administratorPermissionMigrationRow;
+ #region 绠＄悊鍛樻潈闄愯縼绉�
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
administratorPermissionMigrationRow = new FrameLayout()
{
- Y = Application.GetRealHeight(8) + roomManagementRow.Bottom,
Height = Application.GetRealHeight(65),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(administratorPermissionMigrationRow);
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
+ {
+ //鏄富璐﹀彿鏈汉鎵嶈兘鏄剧ず杩欎釜鑿滃崟
+ contentView.AddChidren(administratorPermissionMigrationRow);
+ }
- var btnAdministratorPermissionMigrationTitle = new Button()
+ btnAdministratorPermissionMigrationTitle = new Button()
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(10),
@@ -265,7 +301,7 @@
};
administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationTitle);
- var btnAdministratorPermissionMigrationExplan = new Button()
+ btnAdministratorPermissionMigrationExplan = new Button()
{
X = Application.GetRealWidth(16),
Y = btnAdministratorPermissionMigrationTitle.Bottom,
@@ -278,7 +314,7 @@
};
administratorPermissionMigrationRow.AddChidren(btnAdministratorPermissionMigrationExplan);
- Button btnAdministratorPermissionMigrationSkinIcon;
+
btnAdministratorPermissionMigrationSkinIcon = new Button()
{
X = Application.GetRealWidth(343),
@@ -298,19 +334,23 @@
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
});
-#endregion
+ #endregion
-#region 杩囨埛
- FrameLayout transferRow;
+ #region 杩囨埛
transferRow = new FrameLayout()
{
Y = administratorPermissionMigrationRow.Bottom,
Height = Application.GetRealHeight(65),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(transferRow);
+ //鏈夌綉鍏虫墠鑳借繃鎴�
+ if (DB_ResidenceData.Instance.HomeGateway != null && string.IsNullOrEmpty(DB_ResidenceData.Instance.HomeGateway.gatewayId) == false
+ && DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
+ {
+ contentView.AddChidren(transferRow);
+ }
- var btnTransferTitle = new Button()
+ btnTransferTitle = new Button()
{
X = Application.GetRealWidth(16),
Y = Application.GetRealHeight(10),
@@ -323,7 +363,7 @@
};
transferRow.AddChidren(btnTransferTitle);
- var btnTrasferExplan = new Button()
+ btnTrasferExplan = new Button()
{
X = Application.GetRealWidth(16),
Y = btnTransferTitle.Bottom,
@@ -336,7 +376,6 @@
};
transferRow.AddChidren(btnTrasferExplan);
- Button btnTrasferSkinIcon;
btnTrasferSkinIcon = new Button()
{
X = Application.GetRealWidth(343),
@@ -346,17 +385,18 @@
UnSelectedImagePath = "Public/RightIcon.png",
};
transferRow.AddChidren(btnTrasferSkinIcon);
-#endregion
+ #endregion
-#region 璋冭瘯鏉冮檺
+ #region 璋冭瘯鏉冮檺
+
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
FrameLayout commissioningAuthorityRow;
commissioningAuthorityRow = new FrameLayout()
{
- Y = Application.GetRealHeight(8) + transferRow.Bottom,
Height = Application.GetRealHeight(65),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(commissioningAuthorityRow);
+ contentView.AddChidren(commissioningAuthorityRow);
var btnCommissioningAuthorityTitle = new Button()
@@ -393,13 +433,25 @@
Height = Application.GetMinRealAverage(36),
UnSelectedImagePath = "Public/Switch.png",
SelectedImagePath = "Public/SwitchOn.png",
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm
};
commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);
-#endregion
+ btnCommissioningAuthoritySwitchIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ DB_ResidenceData.Instance.CurrentRegion.debugPerm = !DB_ResidenceData.Instance.CurrentRegion.debugPerm;
+ btnCommissioningAuthoritySwitchIcon.IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm;
+ new System.Threading.Thread(() =>
+ {
+ new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm);
+ })
+ { IsBackground = true }.Start();
+ };
+
+ #endregion
LoadEventList();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0