From 0c1e29166e6b188939c092d16f87ce2a27662c5f Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期五, 26 三月 2021 10:11:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/temp-wxr' into dev-tzy
---
HDL_ON/Entity/Function/Fan.cs | 50 +-------------------------------------------------
1 files changed, 1 insertions(+), 49 deletions(-)
diff --git a/HDL_ON/Entity/Function/Fan.cs b/HDL_ON/Entity/Function/Fan.cs
index 2b95fee..ce91f65 100644
--- a/HDL_ON/Entity/Function/Fan.cs
+++ b/HDL_ON/Entity/Function/Fan.cs
@@ -3,60 +3,12 @@
namespace HDL_ON.Entity
{
- public class Fan : Function
+ public class Fan
{
public Fan()
{
}
-
- [Newtonsoft.Json.JsonIgnore]
- public Trait trait_openLevel;
- /// <summary>
- /// 妗d綅
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public int openLevel
- {
- get
- {
- try
- {
- if (trait_openLevel == null)
- {
- trait_openLevel = function.Find((obj) => obj.name == "openLevel");
- if (trait_openLevel == null)
- {
- trait_openLevel = new Trait()
- {
- name = "openLevel",
- value_key = new List<string> { "up", "down" },
- max = 7,
- min = 0,
- };
- }
- trait_openLevel.value = trait_openLevel.min;
- }
- return Convert.ToInt32(trait_openLevel.value);
- }
- catch
- {
- MainPage.Log("openLevel 鏁版嵁鑾峰彇澶辫触.");
- return 0;
- }
- }
- set
- {
- try
- {
- trait_openLevel.value = value;
- }
- catch
- {
- MainPage.Log("openLevel 鏁版嵁鍒锋柊澶辫触.");
- }
- }
- }
}
}
--
Gitblit v1.8.0