From db45c85a6ddebc5018b32a9d9dc04f839db3fa76 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 28 九月 2021 15:59:34 +0800 Subject: [PATCH] 组合调光 --- HDL_ON/Entity/Function/Function.cs | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/HDL_ON/Entity/Function/Function.cs b/HDL_ON/Entity/Function/Function.cs index 4c47af2..e6e5e74 100644 --- a/HDL_ON/Entity/Function/Function.cs +++ b/HDL_ON/Entity/Function/Function.cs @@ -619,6 +619,8 @@ case FunctionAttributeKey.SetTemp: case FunctionAttributeKey.FanSpeed: case FunctionAttributeKey.Percent: + case FunctionAttributeKey.CCT: + case FunctionAttributeKey.RGB: //case FunctionAttributeKey.FadeTime: if (attr.curValue.ToString() == "{}") { @@ -657,12 +659,13 @@ { vv = 26; } - sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString() }); + sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = Convert.ToInt32(vv).ToString(), max = attr.max, min = attr.min }); } else { - sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString() }); + sFunc.status.Add(new SceneFunctionStatus() { key = attr.key, value = attr.curValue.ToString(), max = attr.max, min = attr.min }); } + break; } } @@ -924,6 +927,18 @@ /// </summary> public const string Status = "status"; /// <summary> + /// 鐘舵��(鏈夋棤浜�) + /// </summary> + public const string PeopleStatus = "people_status"; + /// <summary> + /// 鐘舵��(鎶ヨ) + /// </summary> + public const string AlarmStatus = "alarm_status"; + /// <summary> + /// 鐘舵��(闂悎銆佹墦寮�) + /// </summary> + public const string ContactStatus = "contact_status"; + /// <summary> /// 姣背娉紶鎰熷櫒锛屽姩浣滅姸鎬� /// </summary> public const string ActionStatus = "action_state"; -- Gitblit v1.8.0