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 | 102 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
index 53fb6d3..15277a4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPageBLL.cs
@@ -26,6 +26,68 @@
LoadEvent_SkipbtnAddFunctionPage();
LoadEvent_SkipSmartSpeakerPage();
}
+ if(DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ LoadEvent_SecurityEvent();
+ }
+ }
+
+ /// <summary>
+ /// 鏇存柊瀹夐槻鎺т欢鐘舵��
+ /// </summary>
+ void LoadEvent_UpdataSenurityStatus()
+ {
+ lock (FunctionList.List.securities)
+ {
+ btnResidenceArmText.TextID = StringId.Undefense;
+ foreach (var temp in FunctionList.List.securities)
+ {
+ 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;
+ }
+ }
+ }
+ }
+
+
+ /// <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(action);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ btnResidenceArmIcon.MouseUpEventHandler = eventHandler;
+ btnResidenceArmText.MouseUpEventHandler = eventHandler;
+ }
}
#region 鍒囨崲浣忓畢
@@ -163,7 +225,6 @@
{
var regionId = (string)btnHomeName.Tag;
dialog.Close();
- //LoadEvent_ChangeCurHome(UserInfo.Current.regionList.Find((obj) => obj.RegionID == regionId));
LoadEvent_ChangeCurHome(home);
LoadContentView();
};
@@ -260,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
@@ -291,15 +359,13 @@
/// </summary>
void LoadEvent_SkipGetSupportPage()
{
- btnSupportText.MouseUpEventHandler = (sender, e) =>
- {
- //throw new Exception("寮傚父娴嬭瘯");
-
- 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