From 1f5fdd892e8efc9f1babe1ace9d810803edef396 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 11:29:45 +0800
Subject: [PATCH] 2021-08-27 11:29:39
---
HDL_ON/Common/ApiUtlis.cs | 51 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 2c4449a..09695b6 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -204,7 +204,7 @@
{
endTime = DateTime.Now.AddSeconds(100);
MainPage.Log($"璇诲彇鍦烘櫙鏁版嵁鎴愬姛");
- var sceneList = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
+ var sceneList = JsonConvert.DeserializeObject<List<Scene>>(pack.Data.ToString());
if (sceneList == null)
{
sceneList = new List<Scene>();
@@ -275,12 +275,18 @@
{
UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
}
+ else if(video.interphoneType == InterphoneType.HDL.ToString())
+ {
+ DB_ResidenceData.Instance.SupportFacePass = true;
+ DB_ResidenceData.Instance.SaveResidenceData();
+ }
}
}
//======================瀹夐槻====================
GetSecurityList();
+ //======================SIP璐﹀彿====================
}
catch (Exception ex)
@@ -294,8 +300,11 @@
MainPage.Log($"缁撴潫璇诲彇浜戠鏁版嵁绾跨▼");
endTime = DateTime.MinValue;
DownloadDataComplete = true;
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
//涓嶈�冭檻缃戝叧鎯呭喌锛岀洿鎺ヨ闃�
DAL.Mqtt.MqttClient.InitState();
@@ -327,8 +336,11 @@
DownloadDataComplete = true;
Application.RunOnMainThread(() =>
{
- waitPage.Hide();
- waitPage.RemoveFromParent();
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
});
//鍒濆鍖栨暟鎹�
//SpatialInfo.CurrentSpatial.Clear();
@@ -388,17 +400,38 @@
}
var infoListPack = Ins.httpRequest.GetSecurityInfo(sidList, new List<string>());
var infoList = JsonConvert.DeserializeObject<List<SecurityAlarm>>(infoListPack.Data.ToString());
- foreach (var function in infoList)
+ if (infoList != null)
{
- function.SaveFile();
- FunctionList.List.IniFunctionList(function.savePath, true);
+ var filePathList = FileUtlis.Files.ReadFiles().FindAll((obj) => obj.StartsWith("SecurityData_"));
+ if (filePathList != null)
+ {
+ foreach (var file in filePathList)
+ {
+ FileUtlis.Files.DeleteFile(file);
+ }
+ }
+ foreach (var function in infoList)
+ {
+ function.SaveFile();
+ FunctionList.List.IniFunctionList(function.savePath, true);
+ }
}
- }
+ }
else
{
MainPage.Log($"璇诲彇瀹夐槻鍒楄〃澶辫触:Code:{pack.Code}; Msg:{pack.message}");
}
}
+
+ /// <summary>
+ /// 鑾峰彇SIP璐﹀彿淇℃伅
+ /// </summary>
+ public void GetSipInfo()
+ {
+ var pack = Ins.HttpRequest.GetSecurityList();
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.8.0