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/PersonalCenterPageBLL.cs | 64 ++++++-------------------------
1 files changed, 13 insertions(+), 51 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index c49c83a..0cf89f0 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,7 +161,8 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
+ LoadEvent_ChangeCurHome(home);
LoadContentView();
};
}
@@ -177,14 +178,12 @@
/// <param name="homeTemp"></param>
void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
{
- if (UserInfo.Current.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());
- UserInfo.Current.CurReginID = homeTemp.RegionID;
- UserInfo.Current.SaveUserInfo();
+ DB_ResidenceData.Instance.CurrentRegion = homeTemp;
+ DB_ResidenceData.Instance.SaveResidenceData();
var waitPage = new Loading();
bodyView.AddChidren(waitPage);
waitPage.Start(Language.StringByID(StringId.PleaseWait));
@@ -192,52 +191,15 @@
{
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.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();
- OnAppConfig.Instance.SaveConfig();
- SpatialInfo.CurrentSpatial.InitRoomFunction();
- DB_ResidenceData.residenceData.SaveResidenceData();
+ DB_ResidenceData.Instance.EixtAccount();
//鍒锋柊涓�娆′綇瀹呯綉鍏�
new HttpServerRequest().GetHomeGatewayList();
Application.RunOnMainThread(() =>
{
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ //閲嶇疆缃戝叧鐘舵��
+ DriverLayer.Control.Ins.GatewayOnline = false;
});
//鎼滅储缃戝叧
@@ -269,13 +231,13 @@
#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);
--
Gitblit v1.8.0