From 62d6c4bf6c30da21ccd8245199234c5004117d56 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 21 四月 2023 13:32:15 +0800
Subject: [PATCH] V1.7.1发布版本
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 280 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 166 insertions(+), 114 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
index 81224f4..5cb1eb4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -274,121 +274,124 @@
};
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
#endregion
-
- if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "PAID")
+ //宸茬粡浜や粯
+ if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "Delivered" || DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "SECONDARY_DEBUGGIN")
{
- #region 绠＄悊鍛樻潈闄愯縼绉�
- contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
- administratorPermissionMigrationRow = new FrameLayout()
- {
- Height = Application.GetRealHeight(65),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
- {
- //鏄富璐﹀彿鏈汉鎵嶈兘鏄剧ず杩欎釜鑿滃崟
- contentView.AddChidren(administratorPermissionMigrationRow);
- }
- btnAdministratorPermissionMigrationTitle = new Button()
+ if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus != "SECONDARY_DEBUGGIN")
{
- 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
+ Height = Application.GetRealHeight(65),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ if (DB_ResidenceData.Instance.CurrentRegion.isOtherShare == false)
+ {
+ //鏄富璐﹀彿鏈汉鎵嶈兘鏄剧ず杩欎釜鑿滃崟
+ contentView.AddChidren(administratorPermissionMigrationRow);
+ }
- #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);
+ 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
}
-
- 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) });
@@ -452,12 +455,11 @@
#endregion
-
-
LoadEvent_SkipAdminMigrationConfirmPage();
LoadEvent_SkipTransferConfirmPage();
}
- else
+ //璋冭瘯瀹屾垚 鎵嶈兘鍔犺浇浜岀淮鐮�
+ else if (DB_ResidenceData.Instance.CurrentRegion.deliverStatus == "WAIT_DELIVERED")
{
#region 浜や粯浜岀淮鐮�
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
@@ -479,7 +481,7 @@
};
deliveryQRcodeRow.AddChidren(btnDeliveryQRcodeTitle);
-
+
var btnDeliveryQRcodeRightIcon = new Button()
{
X = Application.GetRealWidth(343),
@@ -491,7 +493,8 @@
deliveryQRcodeRow.AddChidren(btnDeliveryQRcodeRightIcon);
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
var skipPage = new DeliveryQrCodePage();
MainPage.BasePageView.AddChidren(skipPage);
skipPage.LoadPage();
@@ -502,6 +505,55 @@
btnDeliveryQRcodeRightIcon.MouseUpEventHandler = eventHandler;
#endregion
}
+ else
+ {
+ #region 鎴垮眿鐘舵�佹彁绀�
+ contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
+ var houseStatusTipRow = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ contentView.AddChidren(houseStatusTipRow);
+
+ var btnHouseStatusTipTitle = new Button()
+ {
+ X = Application.GetRealWidth(16),
+ Width = Application.GetRealWidth(308),
+ TextID = StringId.HouseStatus,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ };
+ houseStatusTipRow.AddChidren(btnHouseStatusTipTitle);
+
+ switch (DB_ResidenceData.Instance.CurrentRegion.deliverStatus)
+ {
+ case "To_Be_Debugged"://寰呰皟璇�
+ btnHouseStatusTipTitle.Text += Language.StringByID(StringId.To_Be_Debugged);
+ break;
+ case "Debugging"://璋冭瘯涓�
+ btnHouseStatusTipTitle.Text += Language.StringByID(StringId.Debugging);
+ break;
+ case "INITIAL_TATE"://鍒濆鎬�
+ btnHouseStatusTipTitle.Text += Language.StringByID(StringId.INITIAL_TATE);
+ break;
+ case "ACCEPTANCE"://楠屾敹
+ btnHouseStatusTipTitle.Text += Language.StringByID(StringId.ACCEPTANCE);
+ break;
+ case "To_Be_Accepted"://寰呴獙鏀�
+ btnHouseStatusTipTitle.Text += Language.StringByID(StringId.To_Be_Accepted);
+ break;
+ default:
+ btnHouseStatusTipTitle.Text += Language.StringByID(StringId.INITIAL_TATE);
+ break;
+ }
+
+
+ #endregion
+
+
+ }
LoadEventList();
}
}
--
Gitblit v1.8.0