From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
index 2d20372..254b349 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
@@ -14,6 +14,7 @@
LoadEvent_SkipRoomsPage();
LoadEvent_EditResidencName();
LoadEvent_EditResidencAddress();
+ //LoadEvent_SkipAdminMigrationConfirmPage();
//LoadEvent_SkipTransferConfirmPage();
}
@@ -39,6 +40,7 @@
//DB_ResidenceData.residenceData.residecenInfo.Name = str;
var waitPage = new Loading();
+ bodyView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
new System.Threading.Thread(() =>
{
@@ -71,7 +73,11 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
@@ -121,7 +127,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
var skipPage = new FloorsManagementPage();
MainPage.BasePageView.AddChidren(skipPage);
- skipPage.LoadPage(StringId.FloorsManagement);
+ skipPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
floorManagementRow.MouseUpEventHandler = eventHandler;
@@ -211,6 +217,24 @@
}
/// <summary>
+ /// 璺宠浆绠＄悊鍛樻潈闄愯縼绉婚〉闈�
+ /// </summary>
+ void LoadEvent_SkipAdminMigrationConfirmPage()
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ var skipPage = new AdminMigrationConfirmPage();
+ MainPage.BasePageView.AddChidren(skipPage);
+ skipPage.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+
+ administratorPermissionMigrationRow.MouseUpEventHandler = eventHandler;
+ btnAdministratorPermissionMigrationTitle.MouseUpEventHandler = eventHandler;
+ btnAdministratorPermissionMigrationExplan.MouseUpEventHandler = eventHandler;
+ btnAdministratorPermissionMigrationSkinIcon.MouseUpEventHandler = eventHandler;
+ }
+
+ /// <summary>
/// 璺宠浆杩囨埛椤甸潰
/// </summary>
void LoadEvent_SkipTransferConfirmPage()
@@ -227,5 +251,7 @@
btnTrasferSkinIcon.MouseUpEventHandler = eventHandler;
btnTransferTitle.MouseUpEventHandler = eventHandler;
}
+
+
}
}
--
Gitblit v1.8.0