合并嘉乐lc代码

wxr

2021-07-01 adc150efb13a0506f45a3c344c3ee2ef2dba8e90

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

@@ -19,7 +19,7 @@
            LoadEvent_GoPersonalDataPage();
            LoadEvent_SkipAboutOnPage();
            LoadEvent_SkipGetSupportPage();
            if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
            if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
            {
                LoadEvent_SkipResdentialManagePage();
                LoadEvent_GoMemberManagement();
@@ -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,13 +179,13 @@
        /// <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();
            btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
            btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.homeName;
            DB_ResidenceData.Instance.EixtAccount();
            //刷新住宅数据
            Common.ApiUtlis.Ins.DownloadData();
@@ -196,13 +195,13 @@
        #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);
@@ -309,29 +308,10 @@
        {
            btnSmartSpeakerText.MouseUpEventHandler = (sender, e) =>
            {

                //var page = new SmartSpeakerListPage();
                //MainPage.BasePageView.AddChidren(page);
                //page.LoadPage();
                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;

                var mList = new List<string>();
                mList.Add("广东");
                mList.Add("湖南");
                mList.Add("广西");

                var mList2 = new List<List<string>>();
                mList2.Add(new List<string> { "广州", "深圳", "东莞", "佛山", "惠州" });
                mList2.Add(new List<string> { "长沙", "岳阳", "株洲", "株洲" });
                mList2.Add(new List<string> { "桂林", "南宁", "玉林" });
                //PickerView.ShowOneList(mList, null);

                PickerView.ShowSecondary(mList, mList2, (selectIndex1, selectIndex2) =>
                {
                    System.Console.WriteLine("selectIndex：" + mList[selectIndex1] + " - " + mList2[selectIndex1][selectIndex2]);

                    //textView.Text = "selectIndex：" + mList[selectIndex1] + " - " + mList2[selectIndex1][selectIndex2];
                }, 1, 3, "请选择0", "确认0", "取消0");
                var page = new SmartSpeakerListPage();
                MainPage.BasePageView.AddChidren(page);
                page.LoadPage();
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
            };
        }
        #endregion