2020-12-15-2

陈嘉乐

2020-12-15 a35617eb62b317bf3ed92b1462018cf67c920411

 HDL_ON/Entity/Function/Function.cs

@@ -252,7 +252,7 @@
            string roomNameList = "";
            foreach (var roomId in roomIds)
            {
                var findRoom = DB_ResidenceData.residenceData.Rooms.Find(obj => obj.roomId == roomId);
                var findRoom = SpatialInfo.CurrentSpatial.RoomList.Find(obj => obj.roomId == roomId);
                if (findRoom == null)
                {
                    continue;
@@ -317,6 +317,7 @@
            foreach (var attr in attributes)
            {
                sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() });
                sFunc.sid = this.sid;
            }
            return sFunc;
        }
@@ -486,7 +487,7 @@
                switch (key)
                {
                    case "temperature":
                    case "set_temperature":
                    case "set_temp":
                        us = "°C";
                        break;
                    case "percent":
@@ -526,7 +527,7 @@
                        text = Language.StringByID(StringId.FanSpeed);
                        break;
                    case "temperature":
                case "set_temperature":
                case "set_temp":
                        text = Language.StringByID(StringId.Temp);
                        break;
                    case "delay":
@@ -589,7 +590,7 @@
                    text = value == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
                    break;
                case "temperature":
                case "set_temperature":
                case "set_temp":
                case "brightness":
                case "percent":
                    if (value == "")
@@ -774,6 +775,10 @@
        /// 百分比
        /// </summary>
        public const string Percent = "percent";
        /// <summary>
        /// 室内温度
        /// </summary>
        public const string IndoorTemp = "room_temp";
    }
    /// <summary>
    /// 设备功能oid