From 5eeafe3af80bfd88306bd8ad9e76c8f4b51ca35f Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 17 十二月 2020 14:16:20 +0800
Subject: [PATCH] 增加本地发送的重发机制
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs | 351 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 190 insertions(+), 161 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..d97b978 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePage.cs
@@ -52,11 +52,38 @@
/// </summary>
Button btnRoomManagementTitle;
+ #region F3闃舵
/// <summary>
/// 璋冭瘯鏉冮檺寮�鍏虫寜閽�
/// </summary>
- Button btnCommissioningAuthoritySwitchIcon;
+ //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
#endregion
/// <summary>
/// 鏇存柊浣忓畢鍚嶇О鐨勫洖璋冨嚱鏁�
@@ -79,7 +106,8 @@
#region 浣忓畢鍚嶇О
FrameLayout residenceNameRow;
- residenceNameRow = new FrameLayout() {
+ residenceNameRow = new FrameLayout()
+ {
Y = Application.GetRealHeight(72),
Height = Application.GetRealHeight(50),
BackgroundColor = CSS_Color.MainBackgroundColor,
@@ -98,9 +126,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.Name,
TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
@@ -118,7 +146,6 @@
residenceNameRow.AddChidren(btnEditResidenceNameIcon);
#endregion
-#if stage2
residenceNameRow.AddChidren(
new Button()
{
@@ -162,14 +189,13 @@
{
X = Application.GetRealWidth(2) + btnResidenceNameTitle.Right,
Width = Application.GetRealWidth(200),
- Text = DB_ResidenceData.residenceData.residecenInfo.Address,
+ Text = DB_ResidenceData.Instance.CurrentRegion.Address,
TextSize = CSS_FontSize.TextFontSize,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.TextualColor,
};
residenceAddressRow.AddChidren(btnResidenceAddress);
#endregion
-#endif
#region 妤煎眰绠＄悊
floorManagementRow = new FrameLayout()
{
@@ -209,9 +235,9 @@
Width = Application.GetRealWidth(343),
BackgroundColor = CSS_Color.DividingLineColor,
});
-#endregion
+ #endregion
-#region 鎴块棿绠＄悊
+ #region 鎴块棿绠＄悊
roomManagementRow = new FrameLayout()
{
Y = floorManagementRow.Bottom,
@@ -240,163 +266,166 @@
UnSelectedImagePath = "Public/RightIcon.png",
};
roomManagementRow.AddChidren(btnRoomManagementSkinIcon);
-#endregion
-
-#region 绠＄悊鍛樻潈闄愯縼绉�
- FrameLayout administratorPermissionMigrationRow;
- administratorPermissionMigrationRow = new FrameLayout()
- {
- Y = Application.GetRealHeight(8) + roomManagementRow.Bottom,
- Height = Application.GetRealHeight(65),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.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);
-
- 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);
-
- 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,
- });
-#endregion
-
-#region 杩囨埛
- FrameLayout transferRow;
- transferRow = new FrameLayout()
- {
- Y = administratorPermissionMigrationRow.Bottom,
- Height = Application.GetRealHeight(65),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.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);
-
- 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);
-
- 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);
-#endregion
-
-#region 璋冭瘯鏉冮檺
- FrameLayout commissioningAuthorityRow;
- commissioningAuthorityRow = new FrameLayout()
- {
- Y = Application.GetRealHeight(8) + transferRow.Bottom,
- Height = Application.GetRealHeight(65),
- BackgroundColor = CSS_Color.MainBackgroundColor,
- };
- bodyView.AddChidren(commissioningAuthorityRow);
+ #endregion
- 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);
+ #region F3闃舵
+ #region 绠＄悊鍛樻潈闄愯縼绉�
+ //administratorPermissionMigrationRow = new FrameLayout()
+ //{
+ // Y = Application.GetRealHeight(8) + roomManagementRow.Bottom,
+ // Height = Application.GetRealHeight(65),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ //};
+ //bodyView.AddChidren(administratorPermissionMigrationRow);
- 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);
+ //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);
- 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",
- };
- commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);
+ //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);
-#endregion
+
+ //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 杩囨埛
+ //transferRow = new FrameLayout()
+ //{
+ // Y = administratorPermissionMigrationRow.Bottom,
+ // Height = Application.GetRealHeight(65),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ //};
+ //bodyView.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
+ #endregion
+
+ #region F3闃舵
+ #region 璋冭瘯鏉冮檺
+ //FrameLayout commissioningAuthorityRow;
+ //commissioningAuthorityRow = new FrameLayout()
+ //{
+ // Y = Application.GetRealHeight(8) + transferRow.Bottom,
+ // Height = Application.GetRealHeight(65),
+ // BackgroundColor = CSS_Color.MainBackgroundColor,
+ //};
+ //bodyView.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",
+ //};
+ //commissioningAuthorityRow.AddChidren(btnCommissioningAuthoritySwitchIcon);
+ #endregion
+ #endregion
LoadEventList();
--
Gitblit v1.8.0