1127最新合并代码，合并嘉乐更新

wei

2020-11-27 e53a1951d6aa07ad22aad9816da4703496fcbccd

 HDL_ON/Entity/Function/Sensor.cs

@@ -38,7 +38,7 @@
        }

        [Newtonsoft.Json.JsonIgnore]
        public Trait trait_values;
        public FunctionAttributes trait_values;
        /// <summary>
        /// 值
        /// </summary>
@@ -49,18 +49,18 @@
            {
                if (trait_values == null)
                {
                    trait_values = function.Find((obj) => obj.name == "values");
                    trait_values = function.Find((obj) => obj.key == "values");
                    //找不到属性需要声明一个，防止报错闪退
                    if (trait_values == null)
                    {
                        trait_values = new Trait()
                        trait_values = new FunctionAttributes()
                        {
                            name = "values",
                            value_key = new List<string> { "29" },
                            key = "values",
                            value = new List<string> { "29" },
                            max = 10000,
                            min = 0,
                        };
                        trait_values.value = trait_values.min;
                        trait_values.curValue = trait_values.min;
                    }
#if DEBUG
                    //if ( Convert.ToInt32(trait_values.value)  == 0)
@@ -85,12 +85,12 @@
                                level = Math.Round(random.NextDouble() * 100, 0);
                                break;
                        }
                        trait_values.value = level;
                        trait_values.curValue = level;
                    }
#endif

                }
                return Convert.ToDouble(trait_values.value);
                return Convert.ToDouble(trait_values.curValue);
            }
            set
            {
@@ -99,21 +99,21 @@
                 {
                    if (trait_values == null)
                    {
                        trait_values = function.Find((obj) => obj.name == "values");
                        trait_values = function.Find((obj) => obj.key == "values");
                        //找不到属性需要声明一个，防止报错闪退
                        if (trait_values == null)
                        {
                            trait_values = new Trait()
                            trait_values = new FunctionAttributes()
                            {
                                name = "values",
                                value_key = new List<string> { "up" },
                                key = "values",
                                value = new List<string> { "up" },
                                max = 100,
                                min = 0,
                            };
                        }
                        trait_values.value = trait_values.min;
                        trait_values.curValue = trait_values.min;
                    }
                    trait_values.value = value;
                    trait_values.curValue = value;
                    MainPage.Log($"values 数据刷新{value}.");
                }
                catch