From 62d77d3bb8e7215d9da9ecf6f5aeda0b69f805f8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 08 十二月 2020 18:57:15 +0800
Subject: [PATCH] 20201208

---
 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs |   34 ++++++++++++++++++++++++++++++----
 1 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 834db5c..5d72c0e 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)
                 {
@@ -170,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
@@ -181,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;
                         }
@@ -200,7 +219,7 @@
                     //鍒犻櫎鏈湴鏂囦欢
                     foreach (var fileName in backuplist)
                     {
-                        if (fileName == "headImage.png")
+                        if (fileName.Contains(ImageUtlis.HEADIMAGE))
                         {
                             continue;
                         }
@@ -212,12 +231,18 @@
                     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 +259,7 @@
                     {
                         waitPage.Hide();
                         waitPage.RemoveFromParent();
+                        MainPage.InitializationData();
                     });
                 }
             })

--
Gitblit v1.8.0