From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL_ON/Entity/Function/Fan.cs | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/Entity/Function/Fan.cs b/HDL_ON/Entity/Function/Fan.cs
index 2b95fee..36108ac 100644
--- a/HDL_ON/Entity/Function/Fan.cs
+++ b/HDL_ON/Entity/Function/Fan.cs
@@ -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
{
--
Gitblit v1.8.0