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

wxr

2022-04-21 df93e50c747a585aa3acad599ba9be7d9617872d

 HDL_ON/Entity/Function/Function.cs

@@ -111,6 +111,7 @@
        /// <returns></returns>
        public string GetAttrState(string key)
        {
            //一级查询keyValue值
            var attrState = attributes.Find((s) => s.key == key.ToString());
            if (attrState == null)
            {
@@ -118,6 +119,7 @@
            }
            if (string.IsNullOrEmpty(attrState.state))
            {
                //二级查询keyValue值
                return GetOriginalState(key);
            }
            return attrState.state;
@@ -125,8 +127,9 @@

        /// <summary>
        /// 获取初始状态
        /// 默认值：0
        /// </summary>
        /// <param name="key"></param>
        /// <param name="key">语雀定义的属性值</param>
        /// <returns></returns>
        public string GetOriginalState(string key)
        {
@@ -1268,6 +1271,10 @@
        /// 空调
        /// </summary>
        public const string HvacAC = "hvac.ac";
        /// <summary>
        /// 毛细管空调
        /// </summary>
        public const string HvacCac = "hvac.cac";

        /// <summary>
        /// 空调spk列表
@@ -1279,6 +1286,7 @@
            spkList.Add(AcStandard);
            spkList.Add(HvacAC);
            spkList.Add(AcIr);
            spkList.Add(HvacCac);
            return spkList;
        }
        #endregion
@@ -1434,6 +1442,10 @@
        public const string SenesorMegahealth = "sensor.megahealth";
        public const string SenesorMegahealth2 = "sensor.megahealth.zg";
        /// <summary>
        /// 紧急呼叫
        /// </summary>
        public const string SensorHelp = "sensor.help";
        /// <summary>
        /// 安防传感器spk列表
        /// </summary>
        /// <returns></returns>
@@ -1455,6 +1467,17 @@
            spkList.Add(SenesorMegahealth2);
            return spkList;
        }

        /// <summary>
        /// 面板spk列表
        /// </summary>
        /// <returns></returns>
        public static List<string> PanelSpkList()
        {
            var spkList = new List<string>();
            spkList.Add(SensorHelp);
            return spkList;
        }
        #endregion

        #region 环境传感器