2021-4-22 对接乐橙可视对讲

lss

2021-04-22 b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd

 HDL_ON/Entity/FunctionList.cs

@@ -41,7 +41,7 @@
        /// <returns></returns>
        public List<Function> GetAcList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.AcStandard);
            return Functions.FindAll((obj) => obj.spk == SPK.AcStandard || obj.spk == SPK.AcIr);
        }

        /// <summary>
@@ -97,11 +97,21 @@

            return Functions.FindAll((obj) => obj.spk == SPK.ElectricFan || obj.spk == SPK.ElectricTuyaFan
                || obj.spk == SPK.ElectricSocket
                || obj.spk == SPK.IrLearn

                || obj.spk == SPK.TvIr

                || obj.spk == SPK.ElectricTV

                || obj.spk == SPK.ElectricTuyaAirCleaner

                || obj.spk == SPK.ElectricTuyaWeepRobot
                || obj.spk == SPK.ElectricTuyaWaterValve
                || obj.spk == SPK.ClothesHanger);
        }
        /// <summary>
        /// 遥控器列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetIrLearinList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.IrLearn);
        }
        /// <summary>
        /// 风扇列表
@@ -115,7 +125,7 @@
        /// </summary>
        public List<Function> GetTVList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV);
            return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.TvIr);
        }
        /// <summary>
        /// 家电插座列表
@@ -185,13 +195,29 @@
            );
        }

<<<<<<< Updated upstream
=======
        /// <summary>
        /// 可视对讲列表,当为null或size为0则不显示可视对讲icon
        /// </summary>
        // public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;
        public List<UI.UI2.FuntionControlView.Video.Video> videoIntercom = new List<UI.UI2.FuntionControlView.Video.Video>();

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

        /// <summary>
        /// 加载功能列表
        /// </summary>
        /// <param name="filePath"></param>
        public void IniFunctionList(string filePath)
        /// <param name="checkRepeat">
        /// <para>考虑到性能问题追加此变量,是否检测重复,只对function有效</para>
        /// <para>true:当重复存在时,替换掉</para>
        /// <para>false:直接无条件添加</para></param>
        public void IniFunctionList(string filePath, bool checkRepeat = false)
        {
            // todo 增加设备，增加功能进功能列表
            if (filePath.StartsWith("FunctionData_"))
@@ -204,10 +230,21 @@
                    FileUtlis.Files.DeleteFile(filePath);
                    return;
                }


                if (checkRepeat == true)

                {

                    //检测重复

                    for (int i = 0; i < Functions.Count; i++)

                    {

                        if (Functions[i].deviceId == tempFunction.deviceId)

                        {

                            //先移除掉再加

                            Functions.RemoveAt(i);

                            Functions.Add(tempFunction);

                            return;

                        }

                    }

                }
                Functions.Add(tempFunction);

            }
            if (filePath.StartsWith("SceneData_"))
            {
@@ -310,6 +347,7 @@
                List.scenes.Remove(scene);
            }
        }

        /// <summary>
        /// 删除本地功能及文件
        /// </summary>
@@ -427,6 +465,7 @@
            })
            { IsBackground = true }.Start();
        }

        #region 场景相关
        /// <summary>
        /// 添加场景