From ccdff82fac4bcc1067ec806ade5ae897f1214f4d Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 01 四月 2021 14:41:53 +0800
Subject: [PATCH] 异常捕获
---
HDL_ON/Entity/FunctionList.cs | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 98aee72..a53457b 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -80,6 +80,17 @@
var spkList = SPK.AirFreshSpkList();
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+
+ /// <summary>
+ /// 鑳芥簮鍒楄〃
+ /// </summary>
+ /// <returns></returns>
+ public List<Function> GetEnergyList()
+ {
+ var spkList = SPK.EnergySpkList();
+ return Functions.FindAll((obj) => spkList.Contains(obj.spk));
+ }
+
#region 瀹剁數鍒楄〃 electricals
/// <summary>
/// 瀹剁數鍒楄〃
@@ -117,6 +128,14 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+ /// <summary>
+ /// 鍙瀵硅鍒楄〃
+ /// </summary>
+ public UI.UI2.FuntionControlView.Video.VideoMethod.VideoClouds videoIntercom;
+
+ /// <summary>
+ /// 鍦烘櫙鍒楄〃
+ /// </summary>
public List<Scene> scenes = new List<Scene>();
/// <summary>
@@ -137,6 +156,7 @@
var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
if (tempFunction == null)
{
+ MainPage.Log("null");
FileUtlis.Files.DeleteFile(filePath);
return;
}
--
Gitblit v1.8.0