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

lss

2021-04-22 b8bdf52ccc38e3c6b0a95c2b60f59fc99dc546fd

 HDL_ON/Entity/FunctionList.cs

@@ -98,7 +98,7 @@
            return Functions.FindAll((obj) => obj.spk == SPK.ElectricFan || obj.spk == SPK.ElectricTuyaFan
                || obj.spk == SPK.ElectricSocket
                || obj.spk == SPK.IrLearn

                || obj.spk == SPK.IrTV

                || obj.spk == SPK.TvIr

                || obj.spk == SPK.ElectricTV

                || obj.spk == SPK.ElectricTuyaAirCleaner

                || obj.spk == SPK.ElectricTuyaWeepRobot
@@ -125,7 +125,7 @@
        /// </summary>
        public List<Function> GetTVList()
        {
            return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.IrTV);
            return Functions.FindAll((obj) => obj.spk == SPK.ElectricTV || obj.spk == SPK.TvIr);
        }
        /// <summary>
        /// 家电插座列表
@@ -195,6 +195,18 @@
            );
        }

<<<<<<< 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>
@@ -335,6 +347,7 @@
                List.scenes.Remove(scene);
            }
        }

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

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