From 57c036644fae5019385829edbd72be9a7e00fa7d Mon Sep 17 00:00:00 2001
From: Tong <1025782220@qq.com>
Date: 星期二, 31 八月 2021 10:18:03 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into jpush_tst
---
HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
index 8cb90b4..4922410 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePageBLL.cs
@@ -14,11 +14,53 @@
/// </summary>
public static void LoadEvent_RefreshAir()
{
- if (bodyView != null)
+ Application.RunOnMainThread(() =>
{
- bodyView.btnTempValues.Text = MainPage.cityInfo.temperature == null ? "--" : MainPage.cityInfo.temperature + "掳";
- bodyView.btnHumidityValues.Text = MainPage.cityInfo.humidity == null ? "--" : MainPage.cityInfo.humidity + "%";
- bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
+ if (bodyView != null)
+ {
+ bodyView.btnTempValues.Text = MainPage.cityInfo.temperature == null ? "--" : MainPage.cityInfo.temperature + "掳";
+ bodyView.btnHumidityValues.Text = MainPage.cityInfo.humidity == null ? "--" : MainPage.cityInfo.humidity + "%";
+ bodyView.btnPm25Values.Text = MainPage.cityInfo.pm25 == null ? "--" : MainPage.cityInfo.pm25;
+ }
+ });
+ }
+
+ /// <summary>
+ /// 鏇存柊瀹夐槻鐘舵��
+ /// </summary>
+ public static void LoadEvent_RefreshSecurityStatus()
+ {
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ 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}");
}
}
@@ -593,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)
{
@@ -618,7 +660,7 @@
{
Application.RunOnMainThread(() =>
{
- ShowMesBtnState(pushMessageInfoList[0], true);
+ ShowMesBtnState(pushMessageInfoList.list[0], true);
});
}
}
--
Gitblit v1.8.0