From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 06 七月 2023 22:43:05 +0800
Subject: [PATCH] 门锁功能
---
HDL_ON/Entity/FunctionList.cs | 68 ++++++++++++++++++++++++++--------
1 files changed, 52 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index f21e670..2b3bb70 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -14,20 +14,20 @@
{
static FunctionList _FunctionList;
- public static void ClearData()
- {
- try
- {
- _FunctionList._IpCamImou = null;
- _FunctionList.ClearDatas();
- _FunctionList = null;
- }
- catch (Exception ex)
- {
- MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
- _FunctionList = null;
- }
- }
+ //public static void ClearData()
+ //{
+ // try
+ // {
+ // _FunctionList._IpCamImou = null;
+ // _FunctionList.ClearDatas();
+ // _FunctionList = null;
+ // }
+ // catch (Exception ex)
+ // {
+ // MainPage.Log($"娓呯悊FunctionList寮傚父:{ex.Message}");
+ // _FunctionList = null;
+ // }
+ //}
public static FunctionList List
{
@@ -56,6 +56,12 @@
/// </summary>
public List<Function> Functions = new List<Function>();
/// <summary>
+ /// 缇ゆ帶鍒楄〃
+ /// </summary>
+ public List<GroupControl> groupControls = new List<GroupControl>();
+
+
+ /// <summary>
/// 鏈烘鑷傚垪琛�
/// </summary>
/// <returns></returns>
@@ -77,6 +83,17 @@
if (_IpCamImou.Count > 0)
{
#if __IOS__
+ //鍒濆鍖栧ぇ鍗庢憚鍍忓ごsdk
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().InitSDKWithAppKey("HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().AccessToken = UserInfo.Current.LoginTokenString;
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshToken = UserInfo.Current.RefreshToken;
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
+ Console.WriteLine("token锛�" + UserInfo.Current.LoginTokenString);
+ Console.WriteLine("token锛�" + UserInfo.Current.RefreshToken);
+ Shared.IOS.HDLCNVRSDK.HDLLCNVRSDK.SharedInstance().RefreshDeviceList();
+
+
+
#else
Com.Utils.HdlToLcUtils.Instance.InitData(Shared.Application.Activity, "HDL-HOME-APP-TEST", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", OnAppConfig.Instance.RequestHttpsHost);
Com.Utils.HdlToLcUtils.Instance.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
@@ -94,7 +111,7 @@
/// <returns></returns>
public List<Function> GetAcstParentList()
{
- return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);
+ return Functions.FindAll((obj) => obj.spk == SPK.AcstParent);//.OrderByDescending(o=>o.controlCounter).ToList()
}
/// <summary>
@@ -126,6 +143,15 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
/// <summary>
+ /// 搴忓垪鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetSeries()
+ {
+ return Functions.FindAll((obj) => obj.spk == SPK.CommonSeries);
+ }
+
+ /// <summary>
/// 绐楀笜鍒楄〃
/// </summary>
public List<Function> GetCurtainList()
@@ -146,6 +172,15 @@
public List<Function> GetDoorLockList()
{
var spkList = SPK.GetDoorLockSPKList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+ /// <summary>
+ /// 鑾峰彇钀ょ煶瑙嗛闂ㄩ攣
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetVideoDoorLockList()
+ {
+ var spkList = SPK.GetVideoDoorLockSPKList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
@@ -232,6 +267,7 @@
var spkList = new List<string>()
{
SPK.SensorPir,
+ SPK.SensorPirHold,
SPK.SensorDoorWindow,
SPK.SensorSmoke,
SPK.SensorWater,
@@ -358,7 +394,7 @@
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
if (temp == null)
{
- MainPage.Log("null");
+ MainPage.Log("SecurityData_null");
FileUtlis.Files.DeleteFile(filePath);
return;
}
--
Gitblit v1.8.0