From 557c8c4f75aafc97533721766272410042440d34 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 21 八月 2021 11:00:29 +0800
Subject: [PATCH] 安防功能
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 116 +++++++++++++++++++++-------------------------------------
1 files changed, 42 insertions(+), 74 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 331e653..ff66821 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,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,18 +292,26 @@
{
btnSupportText.MouseUpEventHandler = (sender, e) =>
{
- //var getsupportPage = new GetSupportPage();
- //MainPage.BasePageView.AddChidren(getsupportPage);
- //getsupportPage.LoadPage();
- //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
-
var getsupportPage = new FAQHelpPage();
MainPage.BasePageView.AddChidren(getsupportPage);
getsupportPage.LoadPage();
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
--
Gitblit v1.8.0