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/PersonalCenterPageBLL.cs | 119 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 44 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 0fb455a..e00aa2f 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -61,8 +62,24 @@
};
dispalyView.AddChidren(contentView);
- if (UserInfo.Current.regionList.Count < 3)
+ if (UserInfo.Current.regionList.Count < 2)
{
+
+ }
+ else if (UserInfo.Current.regionList.Count < 3)
+ {
+ dispalyView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(10),
+ Y = Application.GetRealHeight(268),
+ Width = Application.GetRealWidth(160),
+ Height = Application.GetRealHeight(105),
+ BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
+ };
+ dialogBody.AddChidren(dispalyView);
+
+ contentView.Height = Application.GetRealHeight(45 * 2);
+ dispalyView.AddChidren(contentView);
}
else if (UserInfo.Current.regionList.Count < 4)
{
@@ -144,7 +161,6 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- //DB_ResidenceData.residenceData.CurReginID = regionId;
LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
LoadContentView();
};
@@ -161,63 +177,71 @@
/// <param name="homeTemp"></param>
void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
{
- if (DB_ResidenceData.residenceData.CurReginID == homeTemp.RegionID)
+ if (UserInfo.Current.CurReginID == 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();
+ //string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
+ //string newRegionRootPath = FileUtils.CreateRegionBackup(homeTemp.RegionID.ToString());
+ UserInfo.Current.CurReginID = homeTemp.RegionID;
+ UserInfo.Current.SaveUserInfo();
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);
+ //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.Contains(ImageUtlis.HEADIMAGE) || fileName == OnAppConfig.ConfigFile)
+ // {
+ // 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.Contains(ImageUtlis.HEADIMAGE))
+ // {
+ // continue;
+ // }
+ // FileUtils.DeleteFile(fileName);
+ //}
+ ////鍊掑嚭鏂颁綇瀹呮暟鎹�
+ //FileUtils.RestoreRegionFiles(newRegionRootPath);
+ UserInfo.Current.CurReginID = homeTemp.RegionID;
UserInfo.Current.SaveUserInfo();
DB_ResidenceData.residenceData.EixtAccount();
- DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
OnAppConfig.Instance.SaveUserConfig();
- DB_ResidenceData.InitRoomFunction();
+ SpatialInfo.CurrentSpatial.InitRoomFunction();
DB_ResidenceData.residenceData.SaveResidenceData();
+ //鍒锋柊涓�娆′綇瀹呯綉鍏�
+ new HttpServerRequest().GetHomeGatewayList();
+
Application.RunOnMainThread(() =>
{
btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
});
+
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
}
catch (Exception ex)
{
@@ -234,6 +258,7 @@
{
waitPage.Hide();
waitPage.RemoveFromParent();
+ MainPage.InitializationData();
});
}
})
@@ -341,7 +366,13 @@
{
btnSupportText.MouseUpEventHandler = (sender, e) =>
{
- var getsupportPage = new GetSupportPage();
+ //var getsupportPage = new GetSupportPage();
+ //MainPage.BasePageView.AddChidren(getsupportPage);
+ //getsupportPage.LoadPage();
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+
+ var getsupportPage = new FAQHelpPage();
MainPage.BasePageView.AddChidren(getsupportPage);
getsupportPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
--
Gitblit v1.8.0