From 203c3a3ffde6259413d9743f6a723b95b1e7989c Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期四, 06 七月 2023 22:43:05 +0800 Subject: [PATCH] 门锁功能 --- HDL_ON/Entity/Function/Scene.cs | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs index a6b5568..9be9505 100644 --- a/HDL_ON/Entity/Function/Scene.cs +++ b/HDL_ON/Entity/Function/Scene.cs @@ -624,7 +624,7 @@ var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle); if (perAngle != null) { - sceneFunctionInfo += " " + perState.value + "掳"; + sceneFunctionInfo += " " + perAngle.value + "掳"; } return sceneFunctionInfo; } @@ -663,7 +663,7 @@ text = Language.StringByID(StringId.Brightness); break; case FunctionAttributeKey.RGB: - text = Language.StringByID(StringId.ColorValue); + text = "RGB";// Language.StringByID(StringId.ColorValue); break; case FunctionAttributeKey.Mode: text = Language.StringByID(StringId.Mode); @@ -699,18 +699,19 @@ return text; } + public string UintString = ""; /// <summary> /// 灞炴�у�煎崟浣� /// </summary> - public string GetUintString(string inputKey = "") + public string GetUintString() { + if (!string.IsNullOrEmpty(UintString)) + { + return UintString; + } var us = ""; var swithchString = key; - if (!string.IsNullOrEmpty(inputKey)) - { - swithchString = inputKey; - } switch (swithchString) { case FunctionAttributeKey.SetTemp: @@ -750,6 +751,7 @@ text = catchString == "true" ? Language.StringByID(StringId.Defense) : Language.StringByID(StringId.Undefense); break; case FunctionAttributeKey.OnOff: + case FunctionAttributeKey.Colorful: text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF); break; case FunctionAttributeKey.SetTemp: -- Gitblit v1.8.0