From 8ccc71771efec9434ad3b4a45c5f2ec11326d40f Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期五, 23 四月 2021 10:25:24 +0800
Subject: [PATCH] 2021-04-23 添加乐橙可视对讲
---
HDL_ON/Entity/FunctionList.cs | 42 +++++++-----------------------------------
1 files changed, 7 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/Entity/FunctionList.cs b/HDL_ON/Entity/FunctionList.cs
index 9f60e5f..82b8dbe 100644
--- a/HDL_ON/Entity/FunctionList.cs
+++ b/HDL_ON/Entity/FunctionList.cs
@@ -101,6 +101,7 @@
return Functions.FindAll((obj) => spkList.Contains(obj.spk));
}
+
/// <summary>
/// 绾㈠瀹濆垪琛�
/// </summary>
@@ -128,19 +129,15 @@
}
/// <summary>
- /// 鍙瀵硅鍒楄〃
+ /// 鍙瀵硅鍒楄〃,褰撲负null鎴杝ize涓�0鍒欎笉鏄剧ず鍙瀵硅icon
/// </summary>
- public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
+ // public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
+ public List<UI.UI2.FuntionControlView.Video.Video> videoIntercom = new List<UI.UI2.FuntionControlView.Video.Video>();
/// <summary>
/// 鍦烘櫙鍒楄〃
/// </summary>
public List<Scene> scenes = new List<Scene>();
-
- /// <summary>
- /// 瀹夐槻鍒楄〃
- /// </summary>
- public List<Security> securities = new List<Security>();
/// <summary>
/// 鍔犺浇鍔熻兘鍒楄〃
@@ -180,39 +177,12 @@
}
Functions.Add(tempFunction);
}
- else if (filePath.StartsWith("SceneData_"))
+ if (filePath.StartsWith("SceneData_"))
{
var sceneDataBytes = FileUtlis.Files.ReadFile(filePath);
var sceneDataString = System.Text.Encoding.UTF8.GetString(sceneDataBytes);
var tempScene = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene>(sceneDataString);
List.scenes.Add(tempScene);
- }
- else if (filePath.StartsWith("SecurityData_"))
- {
- var dataBytes = FileUtlis.Files.ReadFile(filePath);
- var dataString = System.Text.Encoding.UTF8.GetString(dataBytes);
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<Security>(dataString);
- if (temp == null)
- {
- MainPage.Log("null");
- FileUtlis.Files.DeleteFile(filePath);
- return;
- }
- if (checkRepeat == true)
- {
- //妫�娴嬮噸澶�
- for (int i = 0; i < securities.Count; i++)
- {
- if (securities[i].sid == temp.sid)
- {
- //鍏堢Щ闄ゆ帀鍐嶅姞
- securities.RemoveAt(i);
- securities.Add(temp);
- return;
- }
- }
- }
- securities.Add(temp);
}
}
@@ -308,6 +278,7 @@
List.scenes.Remove(scene);
}
}
+
/// <summary>
/// 鍒犻櫎鏈湴鍔熻兘鍙婃枃浠�
/// </summary>
@@ -425,6 +396,7 @@
})
{ IsBackground = true }.Start();
}
+
#region 鍦烘櫙鐩稿叧
/// <summary>
/// 娣诲姞鍦烘櫙
--
Gitblit v1.8.0