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/Curtain.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/Entity/Function/Curtain.cs b/HDL_ON/Entity/Function/Curtain.cs
index 6dded34..ee1da9d 100644
--- a/HDL_ON/Entity/Function/Curtain.cs
+++ b/HDL_ON/Entity/Function/Curtain.cs
@@ -17,7 +17,7 @@
{
}//percent
[Newtonsoft.Json.JsonIgnore]
- public Trait trait_percent;
+ public FunctionAttributes trait_percent;
/// <summary>
/// 寮�鍏崇櫨鍒嗘瘮
/// 0-100
@@ -31,20 +31,27 @@
{
if(trait_percent==null)
{
- trait_percent = function.Find((obj) => obj.name == "percent");
+ trait_percent = attributes.Find((obj) => obj.key == "percent");
if (trait_percent == null)
{
- trait_percent = new Trait()
+ trait_percent = new FunctionAttributes()
{
- name = "percent",
- value_key = new List<string> { "up", "down" },
+ key = "percent",
+ value = new List<string> { "up", "down" },
max = 100,
min = 0,
+ curValue = 0
};
}
- trait_percent.value = trait_percent.min;
+ if (trait_percent.curValue.ToString() == "{}")
+ trait_percent.curValue = 0;
+ }
+ string textValue = trait_percent.curValue.ToString();
+ if (textValue == string.Empty)
+ {
+ trait_percent.curValue = 0;
}
- return Convert.ToInt32( trait_percent.value);
+ return Convert.ToInt32( trait_percent.curValue);
}
catch
{
@@ -56,7 +63,7 @@
{
try
{
- trait_percent.value = value;
+ trait_percent.curValue = value;
}
catch
{
--
Gitblit v1.8.0