From c5cb6840bd986bbd71a9ebc232bbf44ed0e1fc3d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 17:43:11 +0800
Subject: [PATCH] jpush更新完成

---
 HDL_ON/Entity/FunctionList.cs |   61 +++++++++++++++++-------------
 1 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index aecf05a..f8d3798 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
         {
@@ -143,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()
@@ -163,15 +172,6 @@
         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));
         }
 
@@ -209,7 +209,7 @@
         /// </summary>
         public List<Function> GetElectricals()
         {
-            var spkList = SPK.ElectricalSpkList();
+        var spkList = SPK.ElectricalSpkList();
             return Functions.FindAll((obj) => spkList.Contains(obj.spk));
         }
     
@@ -258,10 +258,13 @@
             var spkList = new List<string>()
             {
                 SPK.SensorPir,
+                SPK.SensorPirHold,
                 SPK.SensorDoorWindow,
                 SPK.SensorSmoke,
                 SPK.SensorWater,
                 SPK.SensorGas,
+                SPK.SensorDryContact,
+                SPK.SensorDryContact2,
             };
 
             return Functions.FindAll((obj) => spkList.Contains(obj.spk));
@@ -384,7 +387,7 @@
                     var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<SecurityAlarm>(dataString);
                     if (temp == null)
                     {
-                        MainPage.Log("null");
+                        MainPage.Log("SecurityData_null");
                         FileUtlis.Files.DeleteFile(filePath);
                         return;
                     }
@@ -537,6 +540,10 @@
         /// </summary>
         public void DeleteFunction(Function delTemp)
         {
+            if(delTemp == null)
+            {
+                return;
+            }
             Functions.Remove(Functions.Find((obj) => obj.deviceId == delTemp.deviceId));
             FileUtlis.Files.DeleteFile(delTemp.savePath);
         }
@@ -576,14 +583,14 @@
         {
             if (lockReadFunctionStatus)
             {
-                MainPage.Log($"澶氭杩涘叆--杩斿洖");
+                MainPage.Log($"澶氭杩涘叆--杩斿洖1");
                 return;
             }
             new Thread(() =>
             {
                 if (lockReadFunctionStatus)
                 {
-                    MainPage.Log($"澶氭杩涘叆--杩斿洖");
+                    MainPage.Log($"澶氭杩涘叆--杩斿洖2");
                     return;
                 }
                 MainPage.Log($"杩涘叆--璇诲彇");

--
Gitblit v1.8.0