From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs | 87 ++++++++++++++++++-------------------------
1 files changed, 36 insertions(+), 51 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
old mode 100755
new mode 100644
index 47a4601..f62265b
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
@@ -14,8 +14,8 @@
LoadEvent_SkipRoomsPage();
LoadEvent_EditResidencName();
LoadEvent_EditResidencAddress();
- //LoadEvent_SkipAdminMigrationConfirmPage();
- //LoadEvent_SkipTransferConfirmPage();
+ LoadEvent_SkipAdminMigrationConfirmPage();
+ LoadEvent_SkipTransferConfirmPage();
}
/// <summary>
@@ -27,18 +27,6 @@
{
Action<string> callBack = (str) =>
{
- if (string.IsNullOrEmpty(str))
- {
- new Tip()
- {
- CloseTime = 1,
- Text = Language.StringByID(StringId.HouseNameCannotBeEmpty),
- Direction = AMPopTipDirection.None,
- }.Show(bodyView);
- return;
- }
- //DB_ResidenceData.residenceData.residecenInfo.Name = str;
-
var waitPage = new Loading();
bodyView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
@@ -52,11 +40,10 @@
{
Application.RunOnMainThread(() =>
{
- // UserInfo.Current.regionList.Find((obj) => obj.Name == btnResidenceName.Text.Trim()).Name = str;
btnResidenceName.Text = str;
upateResidenceName();
});
- DB_ResidenceData.Instance.CurrentRegion.Name = str;
+ DB_ResidenceData.Instance.CurrentRegion.homeName = str;
DB_ResidenceData.Instance.SaveResidenceData();
}
else
@@ -83,7 +70,7 @@
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceName, DB_ResidenceData.Instance.CurrentRegion.Name, callBack,StringId.HouseNameCannotBeEmpty,0,new List<string>());
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceName, DB_ResidenceData.Instance.CurrentRegion.homeName, callBack,StringId.HouseNameCannotBeEmpty,0,new List<string>());
};
btnResidenceName.MouseUpEventHandler = eventHandler;
btnEditResidenceNameIcon.MouseUpEventHandler = eventHandler;
@@ -104,7 +91,7 @@
if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
{
btnResidenceAddress.Text = str;
- DB_ResidenceData.Instance.CurrentRegion.Address = str;
+ DB_ResidenceData.Instance.CurrentRegion.homeAddress = str;
DB_ResidenceData.Instance.SaveResidenceData();
//OnAppConfig.Instance.SaveUserConfig();
}
@@ -113,7 +100,7 @@
IMessageCommon.Current.ShowErrorInfoAlter(responsePack.Code);
}
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceAddress, DB_ResidenceData.Instance.CurrentRegion.Name, callBack, StringId.HouseAddressCannotBeEmpty, 0, new List<string>());
+ new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceAddress, DB_ResidenceData.Instance.CurrentRegion.homeAddress, callBack, StringId.HouseAddressCannotBeEmpty, 0, new List<string>());
};
btnResidenceAddress.MouseUpEventHandler = eventHandler;
btnLocationAddressIcon.MouseUpEventHandler = eventHandler;
@@ -163,41 +150,39 @@
// };
//}
- ///// <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;
- // };
+ /// <summary>
+ /// 璺宠浆绠＄悊鍛樻潈闄愯縼绉婚〉闈�
+ /// </summary>
+ void LoadEvent_SkipAdminMigrationConfirmPage()
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ var form = new AdminMigrationConfirmPage();
+ form.AddForm();
+ };
- // administratorPermissionMigrationRow.MouseUpEventHandler = eventHandler;
- // btnAdministratorPermissionMigrationTitle.MouseUpEventHandler = eventHandler;
- // btnAdministratorPermissionMigrationExplan.MouseUpEventHandler = eventHandler;
- // btnAdministratorPermissionMigrationSkinIcon.MouseUpEventHandler = eventHandler;
- //}
+ administratorPermissionMigrationRow.MouseUpEventHandler = eventHandler;
+ btnAdministratorPermissionMigrationTitle.MouseUpEventHandler = eventHandler;
+ btnAdministratorPermissionMigrationExplan.MouseUpEventHandler = eventHandler;
+ btnAdministratorPermissionMigrationSkinIcon.MouseUpEventHandler = eventHandler;
+ }
- ///// <summary>
- ///// 璺宠浆杩囨埛椤甸潰
- ///// </summary>
- //void LoadEvent_SkipTransferConfirmPage()
- //{
- // EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- // var skipPage = new TransferConfirmPage();
- // MainPage.BasePageView.AddChidren(skipPage);
- // skipPage.LoadPage();
- // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- // };
+ /// <summary>
+ /// 璺宠浆杩囨埛椤甸潰
+ /// </summary>
+ void LoadEvent_SkipTransferConfirmPage()
+ {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ var form = new TransferConfirmPage();
+ form.AddForm();
+ };
- // transferRow.MouseUpEventHandler = eventHandler;
- // btnTrasferExplan.MouseUpEventHandler = eventHandler;
- // btnTrasferSkinIcon.MouseUpEventHandler = eventHandler;
- // btnTransferTitle.MouseUpEventHandler = eventHandler;
- //}
+ transferRow.MouseUpEventHandler = eventHandler;
+ btnTrasferExplan.MouseUpEventHandler = eventHandler;
+ btnTrasferSkinIcon.MouseUpEventHandler = eventHandler;
+ btnTransferTitle.MouseUpEventHandler = eventHandler;
+ }
#endregion
}
--
Gitblit v1.8.0