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 | 144 ++++++++++++++++-------------------------------
1 files changed, 50 insertions(+), 94 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index c49c83a..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;
@@ -18,11 +19,12 @@
LoadEvent_GoPersonalDataPage();
LoadEvent_SkipAboutOnPage();
LoadEvent_SkipGetSupportPage();
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
LoadEvent_SkipResdentialManagePage();
LoadEvent_GoMemberManagement();
LoadEvent_SkipbtnAddFunctionPage();
+ LoadEvent_SkipSmartSpeakerPage();
}
}
@@ -141,7 +143,7 @@
SelectedTextColor = CSS.CSS_Color.MainColor,
Text = home.Name,
TextSize = home.Name.Length > 14 ? CSS.CSS_FontSize.TextFontSize : CSS.CSS_FontSize.SubheadingFontSize,
- IsSelected = DB_ResidenceData.residenceData.residecenInfo.RegionID == home.RegionID,
+ IsSelected = DB_ResidenceData.Instance.CurrentRegion.RegionID == home.RegionID,
IsMoreLines = true,
Tag = home.RegionID
};
@@ -161,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();
};
}
@@ -177,105 +180,29 @@
/// <param name="homeTemp"></param>
void LoadEvent_ChangeCurHome(RegionInfoRes homeTemp)
{
- if (UserInfo.Current.CurReginID == homeTemp.RegionID)
+ if (DB_ResidenceData.Instance.CurrentRegion.RegionID == homeTemp.RegionID)
{
return;
}
- //string oldRegionRootPath = FileUtils.CreateRegionBackup(DB_ResidenceData.residenceData.CurReginID.ToString());
- //string newRegionRootPath = FileUtils.CreateRegionBackup(homeTemp.RegionID.ToString());
- UserInfo.Current.CurReginID = homeTemp.RegionID;
- UserInfo.Current.SaveUserInfo();
- var waitPage = new Loading();
- bodyView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
- new System.Threading.Thread(() =>
- {
- try
- {
- //var backuplist = FileUtils.ReadFiles();
- //int index = 0;
- //FileUtils.DeleteRegionFiles(oldRegionRootPath);
- ////绉诲姩鏂囦欢
- //foreach (var fileName in backuplist)
- //{
- // System.IO.FileInfo fileInfo = new System.IO.FileInfo(FileUtils.RootPath + fileName);
- // if (fileName.Contains(ImageUtlis.HEADIMAGE) || fileName == OnAppConfig.ConfigFile)
- // {
- // continue;
- // }
- // if (fileInfo.Exists)
- // {
- // fileInfo.MoveTo(oldRegionRootPath + fileName);
- // MainPage.Log("move file : " + fileName);
- // }
- // index++;
- // Application.RunOnMainThread(() =>
- // {
- // int pro = (int)(index * 1.0 / backuplist.Count * 50);
- // waitPage.Text = pro.ToString() + "%";
- // });
- //}
- ////鍒犻櫎鏈湴鏂囦欢
- //foreach (var fileName in backuplist)
- //{
- // if (fileName.Contains(ImageUtlis.HEADIMAGE))
- // {
- // continue;
- // }
- // FileUtils.DeleteFile(fileName);
- //}
- ////鍊掑嚭鏂颁綇瀹呮暟鎹�
- //FileUtils.RestoreRegionFiles(newRegionRootPath);
- UserInfo.Current.CurReginID = homeTemp.RegionID;
- UserInfo.Current.SaveUserInfo();
- DB_ResidenceData.residenceData.EixtAccount();
- OnAppConfig.Instance.SaveConfig();
- SpatialInfo.CurrentSpatial.InitRoomFunction();
- DB_ResidenceData.residenceData.SaveResidenceData();
- //鍒锋柊涓�娆′綇瀹呯綉鍏�
- new HttpServerRequest().GetHomeGatewayList();
-
- Application.RunOnMainThread(() =>
- {
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
- });
-
- //鎼滅储缃戝叧
- 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();
+ DB_ResidenceData.Instance.CurrentRegion = homeTemp;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
+ DB_ResidenceData.Instance.EixtAccount();
+ //鍒锋柊浣忓畢鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
}
#endregion
#region 浣忓畢绠＄悊
void LoadEvent_SkipResdentialManagePage()
{
- if (!DB_ResidenceData.residenceData.residecenInfo.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
Action updateResidenceName = () =>
{
- btnCurResidenceName.Text = DB_ResidenceData.residenceData.residecenInfo.Name;
+ btnCurResidenceName.Text = DB_ResidenceData.Instance.CurrentRegion.Name;
};
var residentialManagePage = new ResidentialManagePage(updateResidenceName);
MainPage.BasePageView.AddChidren(residentialManagePage);
@@ -335,7 +262,7 @@
{
EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var page = new SearchDevicePage();
+ var page = new BrandListPage();
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -366,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);
@@ -378,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