场景温度单位更新

wxr

2023-06-07 0131f1fdda0189508264f540d600b46f40411d30

 HDL_ON/Entity/Function/Function.cs

@@ -780,6 +780,31 @@
                    }
                }

                string us = "";
                switch (attr.key)
                {
                    case FunctionAttributeKey.SetTemp:
                    case FunctionAttributeKey.RoomTemp:
                        us = "°C";
                        var tempType = attributes.Find((obj) => obj.key == FunctionAttributeKey.TempType);
                        if (tempType != null)
                        {
                            us = tempType.curValue.ToString();
                        }
                        break;
                    case FunctionAttributeKey.Percent:
                    case FunctionAttributeKey.Brightness:
                        us = "%";
                        break;
                    case FunctionAttributeKey.CCT:
                        us = "K";
                        break;
                    case FunctionAttributeKey.Angle:
                        us = "°";
                        break;
                }


                switch (attr.key)
                {
                    case FunctionAttributeKey.OnOff:
@@ -834,11 +859,15 @@
                            {
                                vv = 26;
                            }
                            sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min });
                            sFunc.status.Add(new SceneFunctionStatus() {
                                UintString = us,
                                key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min }) ;
                        }
                        else
                        {
                            sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min });
                            sFunc.status.Add(new SceneFunctionStatus() {
                                UintString = us,
                                key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min });
                        }

                        break;
@@ -1681,9 +1710,9 @@
        /// </summary>
        public const string SensorPir = "sensor.pir";
        /// <summary>
        /// 人体移动传感器（带持续时间）
        /// 人体存在传感器
        /// </summary>
        public const string sensorPirhold = "sensor.pir_hold";
        public const string SensorPirHold = "sensor.pir_hold";
        /// <summary>
        /// （门窗传感器）
        /// </summary>
@@ -1738,8 +1767,8 @@
        {
            var spkList = new List<string>();
            //spkList.Add(SensorLight);
            spkList.Add(sensorPirhold);
            spkList.Add(SensorPir);
            spkList.Add(SensorPirHold);
            spkList.Add(SensorHelp);
            spkList.Add(SensorDoorWindow);
            spkList.Add(SensorSmoke);