From 64b84c33e8733228c624d07229026470497eb417 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 22 十二月 2020 10:41:16 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/Entity/Function/Function.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs
index 6fe0d9a..da3c490 100644
--- a/HDL_ON/Entity/Function/Function.cs
+++ b/HDL_ON/Entity/Function/Function.cs
@@ -162,7 +162,7 @@
{
if (_trait_on_off == null)
{
- _trait_on_off = attributes.Find((obj) => obj.key == "on_off");
+ _trait_on_off = attributes.Find((obj) => obj.key == FunctionAttributeKey.OnOff);
//鎵句笉鍒板睘鎬ч渶瑕佸０鏄庝竴涓紝闃叉鎶ラ敊闂��
if (_trait_on_off == null)
{
@@ -173,8 +173,12 @@
max = 1,
min = 0,
};
- _trait_on_off.curValue = "on";
+ _trait_on_off.curValue = "off";
}
+ }
+ if(_trait_on_off.curValue.ToString() != "on"&& _trait_on_off.curValue.ToString() != "off")
+ {
+ _trait_on_off.curValue = "off";
}
return _trait_on_off;
}
@@ -297,7 +301,14 @@
//case FunctionAttributeKey.FadeTime:
if (attr.curValue.ToString() == "{}")
{
- attr.curValue = "0";
+ if (attr.key == FunctionAttributeKey.OnOff)
+ {
+ attr.curValue = "off";
+ }
+ else
+ {
+ attr.curValue = "0";
+ }
}
if (attr.key == FunctionAttributeKey.SetTemp)
{
--
Gitblit v1.8.0