Merge branch 'wxr4' into dev-tzy

wxr

2021-06-09 cb6e11c5067ecaba4d8f9907989154167c1e8943

 HDL_ON/Entity/FunctionList.cs

@@ -143,6 +143,25 @@
        /// </summary>
        public UI.UI2.FuntionControlView.Video.VideoClouds videoIntercom;

        List<Function> _OtherBrandFunction;
        /// <summary>
        /// 第三方品牌功能
        /// </summary>
        public List<Function> OtherBrandFunction
        {
            get
            {
                if(_OtherBrandFunction == null)
                {
                    _OtherBrandFunction = new List<Function>();
                    var spkList = SPK.GetAll3tySPK();
                    _OtherBrandFunction = Functions.FindAll((obj) => spkList.Contains(obj.spk));
                }
                return _OtherBrandFunction;
            }
        }


        /// <summary>
        /// 场景列表
        /// </summary>
@@ -271,6 +290,9 @@
            return Functions;
        }




        /// <summary>
        /// 清空设备功能列表
        /// </summary>