光伏更新

wxr

2022-09-14 e22e6699a4ec73e81f45526eb8249379963e22d7

 HDL_ON/Entity/Function/Function.cs

@@ -243,7 +243,30 @@
        /// <summary>
        /// 备注
        /// </summary>
        public string name;
        public string name = "";
        /// <summary>
        /// 设备绑定的homeId
        /// </summary>
        private string _homeId = "";
        public string homeId
        {
            get
            {
                if (string.IsNullOrEmpty(_homeId))
                {
                    return DB_ResidenceData.Instance.CurrentRegion.id;
                }
                else
                {
                    return _homeId;
                }
            }
            set
            {
                _homeId = value;
            }
        }

        /// <summary>
        /// 设备ID
        /// 云端负责生成
@@ -423,6 +446,31 @@
        /// </summary>
        [Newtonsoft.Json.JsonIgnore]
        public string lastState = "";
        /// <summary>
        /// 获取状态显示文本
        /// </summary>
        /// <returns></returns>
        public string GetLastStateText()
        {
            var text = "";
            switch (spk)
            {
                case SPK.HvacCac:
                    switch (GetAttrState(FunctionAttributeKey.Mode))
                    {
                        case "cool":
                            text = Language.StringByID(StringId.Cool);
                            break;
                        case "heat":
                            text = Language.StringByID(StringId.Heat);
                            break;
                    }

                    break;
                    
            }
            return text;
        }

        FunctionAttributes _trait_on_off;
        [Newtonsoft.Json.JsonIgnore]
@@ -1265,6 +1313,11 @@
    public static class SPK
    {
        /// <summary>
        /// 通用开关
        /// </summary>
        public const string OtherCommon = "other.common";

        /// <summary>
        /// 门锁
        /// </summary>
        public const string DoorLock = "security.door";
@@ -1552,6 +1605,7 @@
            var spkList = new List<string>();
            //spkList.Add(SensorLight);
            spkList.Add(SensorPir);
            spkList.Add(SensorHelp);
            spkList.Add(SensorDoorWindow);
            spkList.Add(SensorSmoke);
            spkList.Add(SensorWater);