From d3189eaa6be7c70ed5ac783efe68f43211a90d27 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 20 七月 2023 08:58:56 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://172.16.1.23:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/Entity/Function/Scene.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 48fa113..3b00095 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -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);
@@ -706,7 +706,7 @@
/// </summary>
public string GetUintString()
{
- if (!string.IsNullOrEmpty(UintString))
+ if (!string.IsNullOrEmpty(UintString) && UintString!= "{}")
{
return UintString;
}
@@ -751,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