Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath

wxr

2020-12-18 aa1eb6c809ef1e0e050bfeac53e9f2ea4f11330c

 HDL_ON/Entity/Function/Fan.cs

old mode 100644
new mode 100755
@@ -9,9 +9,8 @@
        {
        }


        [Newtonsoft.Json.JsonIgnore]
        public Trait trait_openLevel;
        public FunctionAttributes trait_openLevel;
        /// <summary>
        /// 档位
        /// </summary>
@@ -24,20 +23,27 @@
                {
                    if (trait_openLevel == null)
                    {
                        trait_openLevel = function.Find((obj) => obj.name == "openLevel");
                        trait_openLevel = attributes.Find((obj) => obj.key == "openLevel");
                        if (trait_openLevel == null)
                        {
                            trait_openLevel = new Trait()
                            trait_openLevel = new FunctionAttributes()
                            {
                                name = "openLevel",
                                value_key = new List<string> { "up", "down" },
                                key = "openLevel",
                                value = new List<string> { "up", "down" },
                                max = 7,
                                min = 0,
                                curValue = 0
                            };
                        }
                        trait_openLevel.value = trait_openLevel.min;
                        if (trait_openLevel.curValue.ToString() == "{}")
                            trait_openLevel.curValue = 0;
                    }

                    string textValue = trait_openLevel.curValue.ToString();
                    if (textValue == string.Empty)
                    {
                        trait_openLevel.curValue = 0;
                    }
                    return Convert.ToInt32(trait_openLevel.value);
                    return Convert.ToInt32(trait_openLevel.curValue);
                }
                catch
                {
@@ -49,7 +55,7 @@
            {
                try
                {
                    trait_openLevel.value = value;
                    trait_openLevel.curValue = value;
                }
                catch
                {