2021-4-1-6

JLChen

2021-04-01 1ebda09d954de4409c5a7f3ba3c3ee75626ec7c0

 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.VideoClouds videoIntercom;

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

        /// <summary>
@@ -138,7 +157,6 @@
                if (tempFunction == null)
                {
                    MainPage.Log("null");

                    FileUtlis.Files.DeleteFile(filePath);
                    return;
                }
@@ -156,7 +174,6 @@
                        }

                    }

                }
                    MainPage.Log("add");
                Functions.Add(tempFunction);
            }
            if (filePath.StartsWith("SceneData_"))