From 299f4b1218c0d3721aa92bf091950d6708942583 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 53 +++++++++++++++++++++++++++++++++++------------------
1 files changed, 35 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 4a678e3..4922410 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -30,21 +30,38 @@
/// </summary>
public static void LoadEvent_RefreshSecurityStatus()
{
- Application.RunOnMainThread(() =>
+ try
{
- if (bodyView != null)
+ Application.RunOnMainThread(() =>
{
- //foreach(var temp in FunctionList.List.securities)
- //{
- // if(temp.status == "enable")
- // {
- // bodyView.btnSecurityStatus.IsSelected = true;
- // return;
- // }
- //}
- bodyView.btnSecurityStatus.IsSelected = SecurityCenter.Ins.InDefense;
- }
- });
+ if (bodyView != null)
+ {
+ lock (FunctionList.List.securities)
+ {
+ foreach (var temp in FunctionList.List.securities)
+ {
+ if (temp.status == "enable")
+ {
+ if (temp.alarm)
+ {
+ bodyView.btnSecurityStatus.SelectedImagePath = "Collection/DefenseAlarmIcon.png";
+ }
+ else
+ {
+ bodyView.btnSecurityStatus.SelectedImagePath = "Collection/DefenseStatusIcon.png";
+ }
+ bodyView.btnSecurityStatus.IsSelected = true;
+ return;
+ }
+ }
+ }
+ }
+ });
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"瀹夐槻涓婚〉鏇存柊寮傚父锛歿ex.Message}");
+ }
}
/// <summary>
@@ -618,12 +635,12 @@
{
//鏈鐨勬秷鎭垪琛�
var unreadList = new List<PushMessageInfo>();
+
+ var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<PushMessageInfoList>(result.Data.ToString());
- var pushMessageInfoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PushMessageInfo>>(result.Data.ToString());
-
- if (pushMessageInfoList != null && pushMessageInfoList.Count > 0)
+ if (pushMessageInfoList != null && pushMessageInfoList.list != null && pushMessageInfoList.list.Count > 0)
{
- foreach (var info in pushMessageInfoList)
+ foreach (var info in pushMessageInfoList.list)
{
if (!info.isRead)
{
@@ -643,7 +660,7 @@
{
Application.RunOnMainThread(() =>
{
- ShowMesBtnState(pushMessageInfoList[0], true);
+ ShowMesBtnState(pushMessageInfoList.list[0], true);
});
}
}
--
Gitblit v1.8.0