From efad979b6fae76fb37a4de7e94e6bac0a85cb72c Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 30 十一月 2021 13:14:28 +0800
Subject: [PATCH] 2021-11-30 1.修复乐橙Android，没调用拒接接口问题。
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs | 98 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 39 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index dad9f45..15277a4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -33,30 +33,11 @@
}
/// <summary>
- /// 瀹夐槻閮ㄥ垎浜嬩欢
+ /// 鏇存柊瀹夐槻鎺т欢鐘舵��
/// </summary>
- void LoadEvent_SecurityEvent()
+ void LoadEvent_UpdataSenurityStatus()
{
- if (btnResidenceArmIcon != null)
- {
- btnResidenceArmIcon.IsSelected = false;
- foreach (var temp in FunctionList.List.securities)
- {
- if (temp.status == "enable")
- {
- btnResidenceArmIcon.IsSelected = true;
- break;
- }
- }
- btnResidenceArmIcon.MouseUpEventHandler = (sender, e) =>
- {
- var page = new ArmCenterPage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
- }
- if (btnResidenceArmText != null)
+ lock (FunctionList.List.securities)
{
btnResidenceArmText.TextID = StringId.Undefense;
foreach (var temp in FunctionList.List.securities)
@@ -64,16 +45,48 @@
if (temp.status == "enable")
{
btnResidenceArmText.TextID = StringId.Defense;
+ if (temp.alarm)
+ {
+ btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceInAlarmIcon.png";
+ }
+ else
+ {
+ btnResidenceArmIcon.SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png";
+ }
+ btnResidenceArmIcon.IsSelected = true;
break;
}
}
- btnResidenceArmText.MouseUpEventHandler = (sender, e) =>
+ }
+ }
+
+
+ /// <summary>
+ /// 瀹夐槻閮ㄥ垎浜嬩欢
+ /// </summary>
+ void LoadEvent_SecurityEvent()
+ {
+ if (btnResidenceArmIcon != null&& btnResidenceArmText != null)
+ {
+ Action action = () =>{
+ Application.RunOnMainThread(() =>
+ {
+ LoadEvent_UpdataSenurityStatus();
+ });
+ };
+
+
+ btnResidenceArmIcon.IsSelected = false;
+ LoadEvent_UpdataSenurityStatus();
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
{
- var page = new ArmCenterPage();
+ var page = new ArmCenterPage(action);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
+ btnResidenceArmIcon.MouseUpEventHandler = eventHandler;
+ btnResidenceArmText.MouseUpEventHandler = eventHandler;
}
}
@@ -308,15 +321,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
@@ -339,13 +359,13 @@
/// </summary>
void LoadEvent_SkipGetSupportPage()
{
- btnSupportText.MouseUpEventHandler = (sender, e) =>
- {
- var getsupportPage = new FAQHelpPage();
- MainPage.BasePageView.AddChidren(getsupportPage);
- getsupportPage.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+ //btnSupportText.MouseUpEventHandler = (sender, e) =>
+ //{
+ // var getsupportPage = new FAQHelpPage();
+ // MainPage.BasePageView.AddChidren(getsupportPage);
+ // getsupportPage.LoadPage();
+ // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ //};
}
/// <summary>
--
Gitblit v1.8.0