From 9c8baf7e7e1169ebdf7d5f7ed33ab29dd5fcbf18 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 17:45:17 +0800
Subject: [PATCH] 2020-12-14 1.解锁设置问题修复，增加面容ID验证。2.错误码对接增加。
---
HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/RoomListManage/ResidentialManagePageBLL.cs
index 94c4218..10a2d90 100644
--- 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>
@@ -40,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(() =>
{
@@ -55,8 +56,8 @@
btnResidenceName.Text = str;
upateResidenceName();
});
- DB_ResidenceData.residenceData.residecenInfo.Name = str;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.CurrentRegion.Name = str;
+ DB_ResidenceData.Instance.SaveResidenceData();
}
else
{
@@ -72,13 +73,17 @@
{
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.Name, callBack,StringId.HouseNameCannotBeEmpty,0,new List<string>());
};
btnResidenceName.MouseUpEventHandler = eventHandler;
btnEditResidenceNameIcon.MouseUpEventHandler = eventHandler;
@@ -99,8 +104,8 @@
if (responsePack.Code.ToUpper() == StateCode.SUCCESS)
{
btnResidenceAddress.Text = str;
- DB_ResidenceData.residenceData.residecenInfo.Address = str;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.CurrentRegion.Address = str;
+ DB_ResidenceData.Instance.SaveResidenceData();
//OnAppConfig.Instance.SaveUserConfig();
}
else
@@ -108,7 +113,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.Name, callBack, StringId.HouseAddressCannotBeEmpty, 0, new List<string>());
};
btnResidenceAddress.MouseUpEventHandler = eventHandler;
btnLocationAddressIcon.MouseUpEventHandler = eventHandler;
@@ -122,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;
--
Gitblit v1.8.0