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 | 142 ++++++++++++++++++++---------------------------
1 files changed, 60 insertions(+), 82 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
index 86d3e94..f62265b 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
@@ -14,6 +14,8 @@
LoadEvent_SkipRoomsPage();
LoadEvent_EditResidencName();
LoadEvent_EditResidencAddress();
+ LoadEvent_SkipAdminMigrationConfirmPage();
+ LoadEvent_SkipTransferConfirmPage();
}
/// <summary>
@@ -25,19 +27,8 @@
{
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));
new System.Threading.Thread(() =>
{
@@ -49,12 +40,11 @@
{
Application.RunOnMainThread(() =>
{
- // UserInfo.Current.regionList.Find((obj) => obj.Name == btnResidenceName.Text.Trim()).Name = str;
btnResidenceName.Text = str;
upateResidenceName();
});
- DB_ResidenceData.residenceData.residecenInfo.Name = str;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.CurrentRegion.homeName = str;
+ DB_ResidenceData.Instance.SaveResidenceData();
}
else
{
@@ -70,17 +60,22 @@
{
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
}
})
{ IsBackground = true }.Start();
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceName, DB_ResidenceData.residenceData.residecenInfo.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;
}
+
/// <summary>
/// 鍔犺浇淇敼浣忓畢鍦板潃浜嬩欢
/// </summary>
@@ -96,8 +91,8 @@
if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
{
btnResidenceAddress.Text = str;
- DB_ResidenceData.residenceData.residecenInfo.Address = str;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.CurrentRegion.homeAddress = str;
+ DB_ResidenceData.Instance.SaveResidenceData();
//OnAppConfig.Instance.SaveUserConfig();
}
else
@@ -105,7 +100,7 @@
IMessageCommon.Current.ShowErrorInfoAlter(responsePack.Code);
}
};
- new PublicAssmebly().LoadDialog_EditParater(StringId.ResidenceAddress, DB_ResidenceData.residenceData.residecenInfo.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;
@@ -119,7 +114,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;
@@ -143,69 +138,52 @@
btnRoomManagementTitle.MouseUpEventHandler = eventHandler;
}
- /// <summary>
- /// 寮�鍏充綇瀹呰皟璇曟潈闄�
- /// </summary>
- void LoadEvent_ChangeDebugPrivilege()
- {
- btnCommissioningAuthoritySwitchIcon.MouseUpEventHandler = (sender, e) =>
- {
- var debugPrivilege = btnCommissioningAuthoritySwitchIcon.IsSelected = !btnCommissioningAuthoritySwitchIcon.IsSelected;
- //if (debugPrivilege)
- //{
- //}
- //var waitPage = new Loading();
- //waitPage.Start(Language.StringByID(StringId.PleaseWait));
- //new System.Threading.Thread(() =>
- //{
- // try
- // {
- // var responsePack = new DAL.Server.HttpServerRequest().EditResidenceInfo();
- // if (responsePack.DB_ResidenceData.functionList
- // {
- // Application.RunOnMainThread(() =>
- // {
- // });
- // }
- // else
- // {
- // var tipStr = "Server erorr";
- // switch (responsePack.StateCode)
- // {
- // case "NoLogin":
- // tipStr = Language.StringByID(StringId.InvalidLoginCertificate);
- // break;
- // case "ParameterOrEmpty":
- // break;
- // }
- // Application.RunOnMainThread(() =>
- // {
- // //鎻愮ず鍘熷洜
- // var tip = new Tip()
- // {
- // Text = tipStr,
- // CloseTime = 1,
- // Direction = AMPopTipDirection.None
- // };
- // tip.Show(bodyView);
- // });
- // }
+ #region F3闃舵
+ ///// <summary>
+ ///// 寮�鍏充綇瀹呰皟璇曟潈闄�
+ ///// </summary>
+ //void LoadEvent_ChangeDebugPrivilege()
+ //{
+ // btnCommissioningAuthoritySwitchIcon.MouseUpEventHandler = (sender, e) =>
+ // {
+ // var debugPrivilege = btnCommissioningAuthoritySwitchIcon.IsSelected = !btnCommissioningAuthoritySwitchIcon.IsSelected;
+ // };
+ //}
- // }
- // catch (Exception ex)
- // {
- // MainPage.Log($"update user name error : {ex.Message}");
- // }
- // finally
- // {
- // Application.RunOnMainThread(() =>
- // {
- // waitPage.Hide();
- // });
- // }
- //})
- //{ IsBackground = true }.Start();
+ /// <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;
}
+
+ /// <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;
+ }
+ #endregion
+
}
}
--
Gitblit v1.8.0