Merge branch 'Dev-Branch' into wxr1215

wxr

2022-05-17 4c586bb23cdcae56ae4e4c62e90e148dc10b9d90

 HDL_ON/Entity/Function/Function.cs

@@ -111,12 +111,34 @@
        /// <returns></returns>
        public string GetAttrState(string key)
        {
            //一级查询keyValue值
            var attrState = attributes.Find((s) => s.key == key.ToString());
            if (attrState == null || string.IsNullOrEmpty(attrState.state))
            if (attrState == null)
            {
                return "0";
            }
            if (string.IsNullOrEmpty(attrState.state))
            {
                //二级查询keyValue值
                return GetOriginalState(key);
            }
            return attrState.state;
        }

        /// <summary>
        /// 获取初始状态
        /// 默认值：0
        /// </summary>
        /// <param name="key">语雀定义的属性值</param>
        /// <returns></returns>
        public string GetOriginalState(string key)
        {
            var originalState = status.Find((s) => s.key == key.ToString());
            if (originalState == null || string.IsNullOrEmpty(originalState.value))
            {
                return "0";
            }
            return originalState.value;
        }
        /// <summary>
        /// 设置属性状态
@@ -327,6 +349,26 @@
        public List<string> roomIds = new List<string>();

        /// <summary>
        /// 存储属性配置
        /// 环境传感器的等级
        /// </summary>
        public List<AttrKeyConfig> attrKeyConfigs = new List<AttrKeyConfig>();

        public List<AttrKeyConfig> GetAttrKeyConfigs(string key)
        {
            if (attrKeyConfigs.Count == 0)
            {
                switch (key)
                {
                    case "pm2.5":

                        break;
                }
            }
            return attrKeyConfigs;
        }

        /// <summary>
        /// bus协议数据格式
        /// 使用A协议控制时，改属性为空
        /// </summary>
@@ -339,6 +381,11 @@
        /// 是否在线
        /// </summary>
        public bool online = true;

        /// <summary>
        /// 环境面板 绑定的 设备目标sid列表
        /// </summary>
        public List<string> targetSids = new List<string>();
        /// <summary>
        /// 云端数据创建的时间
        /// </summary>
@@ -1249,6 +1296,10 @@
        /// 空调
        /// </summary>
        public const string HvacAC = "hvac.ac";
        /// <summary>
        /// 毛细管空调
        /// </summary>
        public const string HvacCac = "hvac.cac";

        /// <summary>
        /// 空调spk列表
@@ -1260,6 +1311,7 @@
            spkList.Add(AcStandard);
            spkList.Add(HvacAC);
            spkList.Add(AcIr);
            spkList.Add(HvacCac);
            return spkList;
        }
        #endregion
@@ -1415,6 +1467,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>
@@ -1437,6 +1493,19 @@
            return spkList;
        }
        #endregion

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

        #region 环境传感器
        /// <summary>
@@ -1802,4 +1871,44 @@
    public string module = "";
    public string version = "";
}

    /// <summary>
    /// 功能属性相关配置信息
    /// 环境传感器等级使用
    /// </summary>
    public class AttrKeyConfig
    {
        public string key = string.Empty;
        /// <summary>
        /// 配置类型
        /// interval 区间
        /// 目前只支持：interval
        /// </summary>
        public string type = string.Empty;

        public string unit = string.Empty;

        public List<AttrKeyInfo> configs = new List<AttrKeyInfo>();

    }

    public class AttrKeyInfo
    {
        /// <summary>
        /// 
        /// </summary>
        public string start = string.Empty;
        /// <summary>
        /// 
        /// </summary>
        public string end = string.Empty;
        /// <summary>
        /// 
        /// </summary>
        public string color = string.Empty;
        /// <summary>
        /// 描述
        /// </summary>
        public string desc = string.Empty;
    }
}