From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 273 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 161 insertions(+), 112 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index f60948b..d285fbb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -57,6 +57,33 @@
/// </summary>
Button btnCommissioningAuthoritySwitchIcon;
+ #region F3闃舵
+ #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
#endregion
/// <summary>
/// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁�
@@ -71,20 +98,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 +132,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,
@@ -117,6 +151,7 @@
};
residenceNameRow.AddChidren(btnEditResidenceNameIcon);
+ #endregion
residenceNameRow.AddChidren(
new Button()
{
@@ -126,8 +161,6 @@
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
});
- #endregion
-
#region 浣忓畢鍦板潃
var residenceAddressRow = new FrameLayout()
{
@@ -135,7 +168,7 @@
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(residenceAddressRow);
+ contentView.AddChidren(residenceAddressRow);
var btnResidenceAddressTitle = new Button()
{
@@ -154,7 +187,8 @@
Gravity = Gravity.CenterVertical,
Width = Application.GetMinRealAverage(28),
Height = Application.GetMinRealAverage(28),
- UnSelectedImagePath = "Public/LocationAddressIcon.png",
+ //UnSelectedImagePath = "Public/LocationAddressIcon.png",
+ UnSelectedImagePath = "Public/Edit.png",
};
residenceAddressRow.AddChidren(btnLocationAddressIcon);
@@ -162,22 +196,22 @@
{
X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
Width = Application.GetRealWidth(200),
- Text = DB_ResidenceData.residenceData.residecenInfo.Address,
+ 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()
{
- Y = Application.GetRealHeight(8) + residenceAddressRow.Bottom,
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(floorManagementRow);
+ contentView.AddChidren(floorManagementRow);
btnFloorManagementTitle = new Button()
{
@@ -218,7 +252,7 @@
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
};
- bodyView.AddChidren(roomManagementRow);
+ contentView.AddChidren(roomManagementRow);
btnRoomManagementTitle = new Button()
{
@@ -242,121 +276,124 @@
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
#endregion
+
+ #region F3闃舵
#region 绠＄悊鍛樻潈闄愯縼绉�
- FrameLayout administratorPermissionMigrationRow;
- administratorPermissionMigrationRow = new FrameLayout()
- {
- Y = Application.GetRealHeight(8) + roomManagementRow.Bottom,
- Height = Application.GetRealHeight(65),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(administratorPermissionMigrationRow);
+ //contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+ //administratorPermissionMigrationRow = new FrameLayout()
+ //{
+ // Height = Application.GetRealHeight(65),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ //};
+ //contentView.AddChidren(administratorPermissionMigrationRow);
- var 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);
- var 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);
- Button 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,
- });
+ //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
#endregion
+ #region F3闃舵
#region 杩囨埛
- FrameLayout transferRow;
- transferRow = new FrameLayout()
- {
- Y = administratorPermissionMigrationRow.Bottom,
- Height = Application.GetRealHeight(65),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(transferRow);
+ //transferRow = new FrameLayout()
+ //{
+ // Y = administratorPermissionMigrationRow.Bottom,
+ // Height = Application.GetRealHeight(65),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ //};
+ //contentView.AddChidren(transferRow);
- var 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);
- var 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);
- Button btnTrasferSkinIcon;
- 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);
+ //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
#endregion
#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,8 +430,20 @@
Height = Application.GetMinRealAverage(36),
UnSelectedImagePath = "Public/Switch.png",
SelectedImagePath = "Public/SwitchOn.png",
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.debugPerm
};
commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);
+
+ 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
@@ -402,4 +451,4 @@
LoadEventList();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0