2023年03月28日14:49:50

wjc

2023-03-28 f46be160caed45c67e8980173d29ed48d525a4d3

 HDL_ON/Entity/FunctionList.cs

@@ -19,7 +19,7 @@
            try
            {
                _FunctionList._IpCamImou = null;
                _FunctionList.Clear();
                _FunctionList.ClearDatas();
                _FunctionList = null;
            }
            catch (Exception ex)
@@ -148,6 +148,15 @@
            var spkList = SPK.GetDoorLockSPKList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 获取萤石视频门锁
        /// </summary>
        /// <returns></returns>
        public List<Function> GetVideoDoorLockList()
        {
            var spkList = SPK.GetVideoDoorLockSPKList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 新风列表
@@ -175,17 +184,9 @@
        /// </summary>
        public List<Function> InverterList()
        {
            //get
            //{
            //    return _inverterList;
            //}
            //set
            //{
            //    _inverterList = value;
            //}
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter);
            return Functions.FindAll((obj) => obj.spk == SPK.Inverter || obj.spk == SPK.InverterRst);
        }
#region 家电列表 electricals
        #region 家电列表 electricals
        /// <summary>
        /// 家电列表
        /// </summary>
@@ -452,14 +453,16 @@
        /// <summary>
        /// 清空设备功能列表
        /// </summary>
        public void Clear()
        public void ClearDatas()
        {
            try
            {
                _IpCamImou.Clear();
                _IpCamImou = null;
                _FunctionList.Clear();
                _FunctionList = null;
                if (_IpCamImou != null)
                {
                    _IpCamImou.Clear();
                    _IpCamImou = null;
                }
                _FunctionList = new FunctionList();
            }
            catch (Exception ex)
            {