From 63a1e0dd7fcda5948c26490d5d7e4c84d6dbf99f Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 16 三月 2021 17:06:19 +0800
Subject: [PATCH] 4
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 111 ++++++++++++-------------------------------------------
1 files changed, 25 insertions(+), 86 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 9dfbe49..7a96fac 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -18,7 +18,7 @@
LoadEvent_GoPersonalDataPage();
LoadEvent_SkipAboutOnPage();
LoadEvent_SkipGetSupportPage();
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
LoadEvent_SkipResdentialManagePage();
LoadEvent_GoMemberManagement();
@@ -141,7 +141,7 @@
SelectedTextColor = CSS.CSS_Color.MainColor,
Text = home.Name,
TextSize = home.Name.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
- IsSelected = DB_ResidenceData.residenceData.residecenInfo.RegionID == home.RegionID,
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.RegionID == home.RegionID,
IsMoreLines = true,
Tag = home.RegionID
};
@@ -161,8 +161,8 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- //DB_ResidenceData.residenceData.CurReginID = regionId;
- LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ LoadEvent_ChangeCurHome(home);
LoadContentView();
};
}
@@ -178,101 +178,29 @@
/// <param name="homeTemp"></param>
void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
{
- if (DB_ResidenceData.residenceData.CurReginID == homeTemp.RegionID)
+ if (DB_ResidenceData.Instance.CurrentRegion.RegionID == homeTemp.RegionID)
{
return;
}
- string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- string newRegionRootPath = FileUtils.CreateRegionBackup(homeTemp.RegionID.ToString());
- DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
- DB_ResidenceData.residenceData.SaveResidenceData();
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
- new System.Threading.Thread(() =>
- {
- try
- {
- var backuplist = FileUtils.ReadFiles();
- int index = 0;
- FileUtils.DeleteRegionFiles(oldRegionRootPath);
- //绉诲姩鏂囦欢
- foreach (var fileName in backuplist)
- {
- System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
- if (fileName == "headImage.png")
- {
- continue;
- }
- if (fileInfo.Exists)
- {
- fileInfo.MoveTo(oldRegionRootPath + fileName);
- MainPage.Log("move file : " + fileName);
- }
- index++;
- Application.RunOnMainThread(() =>
- {
- int pro = (int)(index * 1.0 / backuplist.Count * 50);
- waitPage.Text = pro.ToString() + "%";
- });
- }
- //鍒犻櫎鏈湴鏂囦欢
- foreach (var fileName in backuplist)
- {
- if (fileName == "headImage.png")
- {
- continue;
- }
- FileUtils.DeleteFile(fileName);
- }
- //鍊掑嚭鏂颁綇瀹呮暟鎹�
- FileUtils.RestoreRegionFiles(newRegionRootPath);
- UserInfo.Current.SaveUserInfo();
- DB_ResidenceData.residenceData.EixtAccount();
- DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
- OnAppConfig.Instance.SaveUserConfig();
- DB_ResidenceData.InitRoomFunction();
- DB_ResidenceData.residenceData.SaveResidenceData();
- //鍒锋柊涓�娆′綇瀹呯綉鍏�
- new HttpServerRequest().GetHomeGatewayList();
-
- Application.RunOnMainThread(() =>
- {
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
- });
- }
- catch (Exception ex)
- {
- Application.RunOnMainThread(() =>
- {
- new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.OperationFailed),
- Language.StringByID(StringId.Close)).Show();
- });
- MainPage.Log(ex.Message);
- }
- finally
- {
- Application.RunOnMainThread(() =>
- {
- waitPage.Hide();
- waitPage.RemoveFromParent();
- });
- }
- })
- { IsBackground = true }.Start();
+ DB_ResidenceData.Instance.CurrentRegion = homeTemp;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ DB_ResidenceData.Instance.EixtAccount();
+ //鍒锋柊浣忓畢鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
}
#endregion
#region 浣忓畢绠＄悊
void LoadEvent_SkipResdentialManagePage()
{
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
Action updateResidenceName = () =>
{
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
};
var residentialManagePage = new ResidentialManagePage(updateResidenceName);
MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -332,10 +260,21 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var page = new SearchDevicePage();
+ var page = new BrandListPage();// AddThirdPartyBrandListpage(); // BrandListPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //鑾峰彇鍒楄〃
+ //HDL_ON.UI.UI2.PersonalCenter.PirDevice.Method.GetPirDeviceList(this, () =>
+ //{
+ // Application.RunOnMainThread(() =>
+ // {
+ // var page = new UI2.PersonalCenter.PirDevice.PirMain();
+ // MainPage.BasePageView.AddChidren(page);
+ // page.Show();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ // });
+ //});
};
btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
--
Gitblit v1.8.0