From b13a98b48df67d902da843a3bd3d5659e3737d17 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 28 四月 2021 14:48:55 +0800
Subject: [PATCH] 优化地暖界面、音乐入口界面
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 65 ++++++--------------------------
1 files changed, 12 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 0cf89f0..5379de2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -139,11 +139,11 @@
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);
@@ -178,53 +178,16 @@
/// <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
@@ -237,7 +200,7 @@
{
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);
@@ -297,7 +260,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;
@@ -328,11 +291,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);
--
Gitblit v1.8.0