Merge branch 'master' into WJC

陈嘉乐

2020-12-04 dcb9b9b5561b4e6d1eaf1e602e8ae054e578ec6e

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs

@@ -62,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)
                {
@@ -171,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
@@ -182,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;
                        }
@@ -201,7 +219,7 @@
                    //删除本地文件
                    foreach (var fileName in backuplist)
                    {
                        if (fileName == "headImage.png")
                        if (fileName.Contains(ImageUtlis.HEADIMAGE))
                        {
                            continue;
                        }
@@ -213,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();
@@ -222,6 +240,9 @@
                    {
                        btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
                    });

                    //搜索网关
                    DriverLayer.Control.Ins.SearchLoaclGateway();
                }
                catch (Exception ex)
                {