From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 42 ++++++++++++++++++++++++++++++------------
1 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index dad9f45..8bd3b10 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -40,12 +40,23 @@
if (btnResidenceArmIcon != null)
{
btnResidenceArmIcon.IsSelected = false;
- foreach (var temp in FunctionList.List.securities)
+ lock (FunctionList.List.securities)
{
- if (temp.status == "enable")
+ foreach (var temp in FunctionList.List.securities)
{
- btnResidenceArmIcon.IsSelected = true;
- break;
+ if (temp.status == "enable")
+ {
+ if (temp.alarm)
+ {
+ btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceInAlarmIcon.png";
+ }
+ else
+ {
+ btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png";
+ }
+ btnResidenceArmIcon.IsSelected = true;
+ break;
+ }
}
}
btnResidenceArmIcon.MouseUpEventHandler = (sender, e) =>
@@ -308,15 +319,22 @@
#region 娣诲姞璁惧
void LoadEvent_SkipbtnAddFunctionPage()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
- var page = new BrandListPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- btnResidenceAddFunctionIcon.MouseUpEventHandler = eventHandler;
- btnResidenceAddFunctionText.MouseUpEventHandler = eventHandler;
+ try
+ {
+ 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;
+ }
+ catch { }
+ }
}
#endregion
--
Gitblit v1.8.0