Merge remote-tracking branch 'origin/wjc' into Dev-Branch

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

 HDL_ON/Entity/FunctionList.cs

@@ -72,6 +72,12 @@
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        public List<Function> GetDoorLockList()
        {
            var spkList = SPK.GetDoorLockSPKList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

        /// <summary>
        /// 新风列表
        /// </summary>
@@ -79,6 +85,15 @@
        public List<Function> GetAirFreshList()
        {
            var spkList = SPK.AirFreshSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 面板列表
        /// </summary>
        /// <returns></returns>
        public List<Function> GetPanelList()
        {
            var spkList = SPK.PanelSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }

@@ -139,6 +154,23 @@
            var spkList = SPK.ArmSensorSpkList();
            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }
        /// <summary>
        /// 安防中心支持的传感器列表
        /// </summary>
        public List<Function> GetArmCenterList()
        {
            var spkList = new List<string>()
            {
                SPK.SensorPir,
                SPK.SensorDoorWindow,
                SPK.SensorSmoke,
                SPK.SensorWater,
                SPK.SensorGas,
            };

            return Functions.FindAll((obj) => spkList.Contains(obj.spk));
        }


        /// <summary>
        /// 可视对讲列表,当为null或size为0则不显示可视对讲icon
@@ -175,6 +207,19 @@
        /// </summary>
        public List<SecurityAlarm> securities = new List<SecurityAlarm>();

        public List<SecurityAlarm> GetOrdinarySecurities()
        {
            var ordinarySecurities = new List<SecurityAlarm>();
            foreach (var mode in securities)
            {
                if (mode.type == "all_day" || mode.type == "mute")
                {
                    continue;
                }
                ordinarySecurities.Add(mode);
            }
            return ordinarySecurities;
        }

        /// <summary>
        /// 加载功能列表