From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/Entity/Function/Curtain.cs | 94 ++---------------------------------------------
1 files changed, 4 insertions(+), 90 deletions(-)
diff --git a/HDL_ON/Entity/Function/Curtain.cs b/HDL_ON/Entity/Function/Curtain.cs
index 9a1702f..630b044 100644
--- a/HDL_ON/Entity/Function/Curtain.cs
+++ b/HDL_ON/Entity/Function/Curtain.cs
@@ -4,98 +4,12 @@
namespace HDL_ON.Entity
{
- public class Curtain : Function
+ public class Curtain
{
- /*
- 绐楀笜灞炴�у垪琛細trait: [switch,openLevel,lock]
- 灞炴�� 鎻忚堪
- on_off on/off/stop;
- openLevel 0-100;
- lock boolean (Lock閿佸畾鎺у埗)
- */
- public Curtain()
+ public int GetPercent(Function function)
{
+ return Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.Percent));
}
- [Newtonsoft.Json.JsonIgnore]
- public Trait trait_openLevel;
- /// <summary>
- /// 寮�鍏崇櫨鍒嗘瘮
- /// 0-100
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public int openLevel
- {
- get
- {
- try
- {
- if(trait_openLevel==null)
- {
- trait_openLevel = function.Find((obj) => obj.attri == "openLevel");
- if (trait_openLevel == null)
- {
- trait_openLevel = new Trait()
- {
- attri = "openLevel",
- value = new List<string> { "up", "down" },
- max = 100,
- min = 0,
- };
- }
- trait_openLevel.curValues = trait_openLevel.min;
- }
- return Convert.ToInt32( trait_openLevel.curValues);
- }
- catch
- {
- MainPage.Log("openLevel 鏁版嵁鑾峰彇澶辫触.");
- return 0;
- }
- }
- set
- {
- try
- {
- trait_openLevel.curValues = value;
- }
- catch
- {
- MainPage.Log("openLevel 鏁版嵁鍒锋柊澶辫触.");
- }
- }
- }
-
- /// <summary>
- /// 鎷兼帴銆佽幏鍙朅鍗忚鎿嶄綔鏁版嵁
- /// </summary>
- public override JObject GetSendJObject(CommandType_A command)
- {
- var sendJob = new JObject();
- if (command == CommandType_A.write)
- {
- sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
- JObject data = null;
- switch (functionType)
- {
- case FunctionType.Curtain:
- data = new JObject { { "on_off", on_off }, { "sid", sid } };
- break;
- case FunctionType.MotorCurtain:
- case FunctionType.RollingShutter:
- data = new JObject { { "openLevel", openLevel}, { "sid", sid } };
- break;
- }
- sendJob.Add("objects", data);
- }
- else if (command == CommandType_A.read)
- {
- sendJob = new JObject { { "vendor_code", vendor_code }, { "Command", command.ToString() }, { "Type", "device" } };
- var data = new JObject { { "sid", sid } };
- sendJob.Add("objects", data);
- }
- return sendJob;
- }
-
-
+
}
}
--
Gitblit v1.8.0