Revert "20201127 合并嘉乐代码"

wei

2020-11-27 7ca4d7e50871c558e5927b6b0eeecb2071fdf14c

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

@@ -61,10 +61,10 @@
                };
                dispalyView.AddChidren(contentView);

                if (UserInfo.Current.regionList.Count < 3)
                if ( UserInfo.Current.regionList.Count < 3)
                {
                }
                else if (UserInfo.Current.regionList.Count < 4)
                else if ( UserInfo.Current.regionList.Count < 4)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -79,7 +79,7 @@
                    contentView.Height = Application.GetRealHeight(45 * 3);
                    dispalyView.AddChidren(contentView);
                }
                else if (UserInfo.Current.regionList.Count < 5)
                else if ( UserInfo.Current.regionList.Count < 5)
                {
                    dispalyView = new FrameLayout()
                    {
@@ -113,7 +113,7 @@



                foreach (var home in UserInfo.Current.regionList)
                foreach (var home in  UserInfo.Current.regionList)
                {
                    var btnHomeName = new Button()
                    {
@@ -130,7 +130,7 @@
                    };
                    contentView.AddChidren(btnHomeName);

                    if (UserInfo.Current.regionList.IndexOf(home) < UserInfo.Current.regionList.Count - 1)
                    if ( UserInfo.Current.regionList.IndexOf(home) <  UserInfo.Current.regionList.Count - 1)
                    {
                        contentView.AddChidren(new Button()
                        {
@@ -145,7 +145,7 @@
                        var regionId = (string)btnHomeName.Tag;
                        dialog.Close();
                        //DB_ResidenceData.residenceData.CurReginID = regionId;
                        LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
                        LoadEvent_ChangeCurHome( UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
                        LoadContentView();
                    };
                }
@@ -208,7 +208,7 @@
                    }
                    //倒出新住宅数据
                    FileUtils.RestoreRegionFiles(newRegionRootPath);
                    UserInfo.Current.SaveUserInfo();
                     UserInfo.Current.SaveUserInfo();
                    DB_ResidenceData.residenceData.EixtAccount();
                    DB_ResidenceData.residenceData.CurReginID = homeTemp.RegionID;
                    OnAppConfig.Instance.SaveUserConfig();
@@ -270,11 +270,11 @@
            {
                Action updataHeadImage = () =>
                {
                    userHeadImageView.ImagePath = UserInfo.Current.headImagePagePath;
                    userHeadImageView.ImagePath =  UserInfo.Current.headImagePagePath;
                };
                Action updataUserName = () =>
                {
                    btnUserName.Text = UserInfo.Current.userName;
                    btnUserName.Text =  UserInfo.Current.userName;
                };

                var personalDataView = new PersonalDataPage(updataHeadImage, updataUserName);
@@ -292,8 +292,7 @@
        #region 成员管理
        void LoadEvent_GoMemberManagement()
        {
            EventHandler<MouseEventArgs> eHandler = (sender, e) =>
            {
            EventHandler<MouseEventArgs> eHandler = (sender, e) => {
                var mmp = new MemberManagementPage();
                MainPage.BasePageView.AddChidren(mmp);
                mmp.LoadPage();
@@ -308,8 +307,7 @@
        #region 添加设备
        void LoadEvent_SkipbtnAddFunctionPage()
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
                var page = new SearchDevicePage();
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
@@ -341,13 +339,7 @@
        {
            btnSupportText.MouseUpEventHandler = (sender, e) =>
            {
                //var getsupportPage = new GetSupportPage();
                //MainPage.BasePageView.AddChidren(getsupportPage);
                //getsupportPage.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

                
                var getsupportPage = new FAQHelpPage();
                var getsupportPage = new GetSupportPage();
                MainPage.BasePageView.AddChidren(getsupportPage);
                getsupportPage.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;