From cae4d4b5b508a666fbd0dff3c2a981fdff841bc8 Mon Sep 17 00:00:00 2001 From: wjc <1243177876@qq.com> Date: 星期四, 30 三月 2023 13:10:33 +0800 Subject: [PATCH] Merge branch 'Dev-Branch' into wjc --- HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 393 +++++++++++++++++++++++++++++++------------------------ 1 files changed, 222 insertions(+), 171 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs index 849be74..81224f4 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs @@ -202,9 +202,9 @@ }; residenceAddressRow.AddChidren(btnResidenceAddress); #endregion - #region 妤煎眰绠$悊 contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); + #region 妤煎眰绠$悊 floorManagementRow = new FrameLayout() { Height = Application.GetRealHeight(50), @@ -275,182 +275,233 @@ roomManagementRow.AddChidren(btnRoomManagementSkinIcon); #endregion - #region 绠$悊鍛樻潈闄愯縼绉� - contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); - administratorPermissionMigrationRow = new FrameLayout() + if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "PAID") { - Height = Application.GetRealHeight(65), - BackgroundColor = CSS_Color.MainBackgroundColor, - }; - if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false) - { - //鏄富璐﹀彿鏈汉鎵嶈兘鏄剧ず杩欎釜鑿滃崟 - 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); - - 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); - - administratorPermissionMigrationRow.AddChidren( - new Button() + #region 绠$悊鍛樻潈闄愯縼绉� + contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); + administratorPermissionMigrationRow = new FrameLayout() { - Gravity = Gravity.CenterHorizontal, - Y = Application.GetRealHeight(64), - Height = Application.GetRealHeight(1), - Width = Application.GetRealWidth(343), - BackgroundColor = CSS_Color.DividingLineColor, - }); - #endregion - - #region 杩囨埛 - 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); - - 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 - - #region 璋冭瘯鏉冮檺 - - contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); - FrameLayout commissioningAuthorityRow; - commissioningAuthorityRow = new FrameLayout() - { - Height = Application.GetRealHeight(65), - BackgroundColor = CSS_Color.MainBackgroundColor, - }; - contentView.AddChidren(commissioningAuthorityRow); - - - var btnCommissioningAuthorityTitle = new Button() - { - X = Application.GetRealWidth(16), - Y = Application.GetRealHeight(10), - Width = Application.GetRealWidth(308), - Height = Application.GetRealHeight(24), - TextID = StringId.CommissioningAuthority, - TextAlignment = TextAlignment.CenterLeft, - TextSize = CSS_FontSize.SubheadingFontSize, - TextColor = CSS_Color.FirstLevelTitleColor, - }; - commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityTitle); - - var btnCommissioningAuthorityExplan = new Button() - { - X = Application.GetRealWidth(16), - Y = btnCommissioningAuthorityTitle.Bottom, - Width = Application.GetRealWidth(308), - Height = Application.GetRealHeight(21), - TextID = StringId.CommissioningAuthorityExPlan, - TextAlignment = TextAlignment.CenterLeft, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - TextColor = CSS_Color.PromptingColor1, - }; - commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityExplan); - - btnCommissioningAuthoritySwitchIcon = new Button() - { - X = Application.GetRealWidth(314), - Gravity = Gravity.CenterVertical, - Width = Application.GetMinRealAverage(48), - 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(() => + Height = Application.GetRealHeight(65), + BackgroundColor = CSS_Color.MainBackgroundColor, + }; + if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false) { - new DAL.Server.HttpServerRequest().ChangeResidenceDebugPerm(DB_ResidenceData.Instance.CurrentRegion.debugPerm); - }) - { IsBackground = true }.Start(); - }; + //鏄富璐﹀彿鏈汉鎵嶈兘鏄剧ず杩欎釜鑿滃崟 + contentView.AddChidren(administratorPermissionMigrationRow); + } - #endregion + 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); + 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 + + #region 杩囨埛 + 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); + + 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 + + #region 璋冭瘯鏉冮檺 + + contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); + FrameLayout commissioningAuthorityRow; + commissioningAuthorityRow = new FrameLayout() + { + Height = Application.GetRealHeight(65), + BackgroundColor = CSS_Color.MainBackgroundColor, + }; + contentView.AddChidren(commissioningAuthorityRow); + + + var btnCommissioningAuthorityTitle = new Button() + { + X = Application.GetRealWidth(16), + Y = Application.GetRealHeight(10), + Width = Application.GetRealWidth(308), + Height = Application.GetRealHeight(24), + TextID = StringId.CommissioningAuthority, + TextAlignment = TextAlignment.CenterLeft, + TextSize = CSS_FontSize.SubheadingFontSize, + TextColor = CSS_Color.FirstLevelTitleColor, + }; + commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityTitle); + + var btnCommissioningAuthorityExplan = new Button() + { + X = Application.GetRealWidth(16), + Y = btnCommissioningAuthorityTitle.Bottom, + Width = Application.GetRealWidth(308), + Height = Application.GetRealHeight(21), + TextID = StringId.CommissioningAuthorityExPlan, + TextAlignment = TextAlignment.CenterLeft, + TextSize = CSS_FontSize.PromptFontSize_FirstLevel, + TextColor = CSS_Color.PromptingColor1, + }; + commissioningAuthorityRow.AddChidren(btnCommissioningAuthorityExplan); + + btnCommissioningAuthoritySwitchIcon = new Button() + { + X = Application.GetRealWidth(314), + Gravity = Gravity.CenterVertical, + Width = Application.GetMinRealAverage(48), + 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 + + + + LoadEvent_SkipAdminMigrationConfirmPage(); + LoadEvent_SkipTransferConfirmPage(); + } + else + { + #region 浜や粯浜岀淮鐮� + contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); + var deliveryQRcodeRow = new FrameLayout() + { + Height = Application.GetRealHeight(50), + BackgroundColor = CSS_Color.MainBackgroundColor, + }; + contentView.AddChidren(deliveryQRcodeRow); + + var btnDeliveryQRcodeTitle = new Button() + { + X = Application.GetRealWidth(16), + Width = Application.GetRealWidth(308), + TextID = StringId.ResidentialDelivery, + TextAlignment = TextAlignment.CenterLeft, + TextSize = CSS_FontSize.SubheadingFontSize, + TextColor = CSS_Color.FirstLevelTitleColor, + }; + deliveryQRcodeRow.AddChidren(btnDeliveryQRcodeTitle); + + + var btnDeliveryQRcodeRightIcon = new Button() + { + X = Application.GetRealWidth(343), + Gravity = Gravity.CenterVertical, + Width = Application.GetMinRealAverage(16), + Height = Application.GetMinRealAverage(16), + UnSelectedImagePath = "Public/RightIcon.png", + }; + deliveryQRcodeRow.AddChidren(btnDeliveryQRcodeRightIcon); + + + EventHandler<MouseEventArgs> eventHandler = (sender, e) => { + var skipPage = new DeliveryQrCodePage(); + MainPage.BasePageView.AddChidren(skipPage); + skipPage.LoadPage(); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + }; + deliveryQRcodeRow.MouseUpEventHandler = eventHandler; + btnDeliveryQRcodeTitle.MouseUpEventHandler = eventHandler; + btnDeliveryQRcodeRightIcon.MouseUpEventHandler = eventHandler; + #endregion + } LoadEventList(); } } -- Gitblit v1.8.0