From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index ebb1055..0d5454a 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -187,6 +187,8 @@
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
@@ -198,7 +200,7 @@
foreach (var fileName in backuplist)
{
System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
- if (fileName == "headImage.png")
+ if (fileName.Contains(ImageUtlis.HEADIMAGE) || fileName == OnAppConfig.ConfigFile)
{
continue;
}
@@ -217,7 +219,7 @@
//鍒犻櫎鏈湴鏂囦欢
foreach (var fileName in backuplist)
{
- if (fileName == "headImage.png")
+ if (fileName.Contains(ImageUtlis.HEADIMAGE))
{
continue;
}
@@ -229,7 +231,7 @@
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();
@@ -238,6 +240,9 @@
{
btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
});
+
+ //鎼滅储缃戝叧
+ DriverLayer.Control.Ins.SearchLoaclGateway();
}
catch (Exception ex)
{
--
Gitblit v1.8.0