From f4c86f68b900bd506ef7214b2ae9bd23a9d2ffa8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 19 十二月 2020 17:48:11 +0800
Subject: [PATCH] 完成筛选房间的功能
---
HDL_ON/Entity/Function/Fan.cs | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Fan.cs b/HDL_ON/Entity/Function/Fan.cs
old mode 100644
new mode 100755
index 3bd8726..36108ac
--- 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 = propertList.Find((obj) => obj.attri == "openLevel");
+ trait_openLevel = attributes.Find((obj) => obj.key == "openLevel");
if (trait_openLevel == null)
{
- trait_openLevel = new Trait()
+ trait_openLevel = new FunctionAttributes()
{
- attri = "openLevel",
+ key = "openLevel",
value = new List<string> { "up", "down" },
max = 7,
min = 0,
+ curValue = 0
};
}
- trait_openLevel.curValues = 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.curValues);
+ return Convert.ToInt32(trait_openLevel.curValue);
}
catch
{
@@ -49,7 +55,7 @@
{
try
{
- trait_openLevel.curValues = value;
+ trait_openLevel.curValue = value;
}
catch
{
--
Gitblit v1.8.0