Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-02 e3ad42ffa2fa67c8f6cb4519ca626fa275c8947d

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

@@ -1,4 +1,5 @@
using 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)
                {
@@ -214,6 +231,9 @@
                    OnAppConfig.Instance.SaveUserConfig();
                    DB_ResidenceData.InitRoomFunction();
                    DB_ResidenceData.residenceData.SaveResidenceData();
                    //刷新一次住宅网关
                    new HttpServerRequest().GetHomeGatewayList();

                    Application.RunOnMainThread(() =>
                    {
                        btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
@@ -341,7 +361,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;