Merge branch 'wxr4' into temp-wxr

wxr

2021-04-19 bbcd6c2017762f9a0e6cf0ac6466bbf78f593b14

 HDL_ON/Entity/FunctionList.cs

@@ -70,6 +70,27 @@
            var spkList = SPK.FhSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 新风列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetAirFreshList()
        {
            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>
        /// 家电列表
@@ -80,7 +101,6 @@
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
    
      
        /// <summary>
        /// 红外宝列表
        /// </summary>
@@ -107,7 +127,20 @@
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 可视对讲列表
        /// </summary>
        public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;

        /// <summary>
        /// 场景列表
        /// </summary>
        public List<Scene> scenes = new List<Scene>();

        /// <summary>
        /// 安防列表
        /// </summary>
        public List<Security> securities = new List<Security>();

        /// <summary>
        /// 加载功能列表
@@ -127,6 +160,7 @@
                var tempFunction = Newtonsoft.Json.JsonConvert.DeserializeObject<Function>(functionDataString);
                if (tempFunction == null)
                {
                    MainPage.Log("null");
                    FileUtlis.Files.DeleteFile(filePath);
                    return;
                }
@@ -146,13 +180,40 @@
                }
                Functions.Add(tempFunction);
            }
            if (filePath.StartsWith("SceneData_"))
            else 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);
            }
        }

        /// <summary>