合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

old mode 100755
new mode 100644
@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using HDL_ON.DAL.Server;
using HDL_ON.Entity;
using Shared;
@@ -18,13 +19,12 @@
            LoadEvent_GoPersonalDataPage();
            LoadEvent_SkipAboutOnPage();
            LoadEvent_SkipGetSupportPage();
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                LoadEvent_SkipResdentialManagePage();
                LoadEvent_GoMemberManagement();
                #region F3阶段
                //LoadEvent_SkipbtnAddFunctionPage();
                #endregion
                LoadEvent_SkipbtnAddFunctionPage();
                LoadEvent_SkipSmartSpeakerPage();
            }
        }

@@ -137,15 +137,15 @@
                    var btnHomeName = new Button()
                    {
                        Width = Application.GetRealWidth(112),
                        Height = Application.GetRealHeight(44),
                        Height = Application.GetRealHeight(40),
                        TextAlignment = TextAlignment.CenterLeft,
                        TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                        SelectedTextColor = CSS.CSS_Color.MainColor,
                        Text = home.Name,
                        TextSize = home.Name.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
                        IsSelected = DB_ResidenceData.Instance.CurrentRegion.RegionID == home.RegionID,
                        Text = home.homeName,
                        TextSize = home.homeName.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
                        IsSelected = DB_ResidenceData.Instance.CurrentRegion.id == home.id,
                        IsMoreLines = true,
                        Tag = home.RegionID
                        Tag = home.id
                    };
                    contentView.AddChidren(btnHomeName);

@@ -163,7 +163,6 @@
                    {
                        var regionId = (string)btnHomeName.Tag;
                        dialog.Close();
                        //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
                        LoadEvent_ChangeCurHome(home);
                        LoadContentView();
                    };
@@ -180,66 +179,29 @@
        /// <param name="homeTemp"></param>
        void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
        {
            if (DB_ResidenceData.Instance.CurrentRegion.RegionID == homeTemp.RegionID)
            if (DB_ResidenceData.Instance.CurrentRegion.id == homeTemp.id)
            {
                return;
            }
            DB_ResidenceData.Instance.CurrentRegion = homeTemp;
            DB_ResidenceData.Instance.SaveResidenceData();
            var waitPage = new Loading();
            bodyView.AddChidren(waitPage);
            waitPage.Start(Language.StringByID(StringId.PleaseWait));
            new System.Threading.Thread(() =>
            {
                try
                {
                    DB_ResidenceData.Instance.EixtAccount();
                    //刷新一次住宅网关
                    new HttpServerRequest().GetHomeGatewayList();

                    Application.RunOnMainThread(() =>
                    {
                        btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
                        //重置网关状态
                        DriverLayer.Control.Ins.GatewayOnline = false;
                    });

                    //搜索网关
                    DriverLayer.Control.Ins.SearchLoaclGateway();
                }
                catch (Exception ex)
                {
                    Application.RunOnMainThread(() =>
                    {
                        new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.OperationFailed),
                                   Language.StringByID(StringId.Close)).Show();
                    });
                    MainPage.Log(ex.Message);
                }
                finally
                {
                    Application.RunOnMainThread(() =>
                    {
                        waitPage.Hide();
                        waitPage.RemoveFromParent();
                        MainPage.InitializationData();
                    });
                }
            })
            { IsBackground = true }.Start();
            btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.homeName;
            DB_ResidenceData.Instance.EixtAccount();
            //刷新住宅数据
            Common.ApiUtlis.Ins.DownloadData();
        }
        #endregion

        #region 住宅管理
        void LoadEvent_SkipResdentialManagePage()
        {
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
                {
                    Action updateResidenceName = () =>
                    {
                        btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
                        btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.homeName;
                    };
                    var residentialManagePage = new ResidentialManagePage(updateResidenceName);
                    MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -294,21 +256,19 @@

        #endregion

        #region F3阶段
        #region 添加设备
        //void LoadEvent_SkipbtnAddFunctionPage()
        //{
        //    EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
        //    {
        //        var page = new SearchDevicePage();
        //        MainPage.BasePageView.AddChidren(page);
        //        page.LoadPage();
        //        MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
        //    };
        //    btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
        //    btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
        //}
        #endregion
        void LoadEvent_SkipbtnAddFunctionPage()
        {
            EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
            {
                var page = new BrandListPage();
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
            btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
            btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
        }
        #endregion

        #region 关于On、获取支持
@@ -332,11 +292,7 @@
        {
            btnSupportText.MouseUpEventHandler = (sender, e) =>
            {
                //var getsupportPage = new GetSupportPage();
                //MainPage.BasePageView.AddChidren(getsupportPage);
                //getsupportPage.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

                //throw new Exception("异常测试");
                
                var getsupportPage = new FAQHelpPage();
                MainPage.BasePageView.AddChidren(getsupportPage);
@@ -344,6 +300,20 @@
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
        }

        /// <summary>
        /// 跳转智能音箱页面
        /// </summary>
        void LoadEvent_SkipSmartSpeakerPage()
        {
            btnSmartSpeakerText.MouseUpEventHandler = (sender, e) =>
            {
                var page = new SmartSpeakerListPage();
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
        }
        #endregion