From 43b6e3d6a3a96e7b759b396df4f141ab105fb6bb Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 05 三月 2021 11:31:58 +0800
Subject: [PATCH] 合并嘉乐代码并测试通过
---
HDL_ON/Entity/Function/Fan.cs | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Fan.cs b/HDL_ON/Entity/Function/Fan.cs
index 6a0bc56..36108ac 100644
--- a/HDL_ON/Entity/Function/Fan.cs
+++ b/HDL_ON/Entity/Function/Fan.cs
@@ -23,7 +23,7 @@
{
if (trait_openLevel == null)
{
- trait_openLevel = function.Find((obj) => obj.key == "openLevel");
+ trait_openLevel = attributes.Find((obj) => obj.key == "openLevel");
if (trait_openLevel == null)
{
trait_openLevel = new FunctionAttributes()
@@ -32,9 +32,16 @@
value = new List<string> { "up", "down" },
max = 7,
min = 0,
+ curValue = 0
};
}
- trait_openLevel.curValue = 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.curValue);
}
--
Gitblit v1.8.0