From 264f86c363a6a019fac8eb138877fee9e4734e2d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 21 八月 2021 17:45:44 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/Common/ApiUtlis.cs | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index b5eb5bb..2c4449a 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -278,6 +278,10 @@
}
}
+
+ //======================瀹夐槻====================
+ GetSecurityList();
+
}
catch (Exception ex)
{
@@ -358,7 +362,7 @@
if (deviceResult.Code == StateCode.SUCCESS)
{
MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
- var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
+ var packList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
foreach(var function in packList.list)
{
@@ -376,14 +380,14 @@
var pack = Ins.HttpRequest.GetSecurityList();
if (pack.Code == StateCode.SUCCESS)
{
- var packList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
+ var packList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(pack.Data.ToString());
var sidList = new List<string>();
foreach (var function in packList)
{
sidList.Add(function.sid);
}
var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
- var infoList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
+ var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
foreach (var function in infoList)
{
function.SaveFile();
--
Gitblit v1.8.0