From cf3d4880046912f8b46c9e54769986a179faa26c Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期四, 08 四月 2021 18:01:13 +0800 Subject: [PATCH] 2021-04-08 1.更新音箱功能 --- HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 121 ++++++++++++++++++--------------------- 1 files changed, 56 insertions(+), 65 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs index e9a23bf..0b28ac8 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs @@ -1,4 +1,5 @@ 锘縰sing System; +using System.Collections.Generic; using HDL_ON.DAL.Server; using HDL_ON.Entity; using Shared; @@ -22,9 +23,8 @@ { LoadEvent_SkipResdentialManagePage(); LoadEvent_GoMemberManagement(); - #region F3闃舵 - //LoadEvent_SkipbtnAddFunctionPage(); - #endregion + LoadEvent_SkipbtnAddFunctionPage(); + LoadEvent_SkipSmartSpeakerPage(); } } @@ -163,7 +163,8 @@ { var regionId = (string)btnHomeName.Tag; dialog.Close(); - LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId)); + //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId)); + LoadEvent_ChangeCurHome(home); LoadContentView(); }; } @@ -183,49 +184,12 @@ { return; } - DB_ResidenceData.Instance.SetCurrentRegion(UserInfo.Current.regionList.IndexOf(homeTemp)); + 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.Name; + DB_ResidenceData.Instance.EixtAccount(); + //鍒锋柊浣忓畢鏁版嵁 + Common.ApiUtlis.Ins.DownloadData(); } #endregion @@ -293,21 +257,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銆佽幏鍙栨敮鎸� @@ -331,11 +293,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); @@ -343,6 +301,39 @@ 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; + + 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"); + }; + } #endregion -- Gitblit v1.8.0