From f703a411c0ebdf7ada490fda75b52fd839dae079 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 16 三月 2023 14:04:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-cqy（1.5.9）' into dev--wxr
---
HDL_ON/Entity/Function/Scene.cs | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 99d3a86..a6b5568 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -112,6 +112,10 @@
//{
// return image;
//}
+ if(image == "")
+ {
+ image = "Intelligence/Gallery/scenebg1.png";
+ }
if (image.Contains("Intelligence/Gallery/scenebg"))
{
@@ -688,6 +692,9 @@
case "angle":
text = Language.StringByID(StringId.Angle);
break;
+ case "security":
+ text = Language.StringByID(StringId.DeploymentStatus);
+ break;
}
return text;
}
@@ -739,6 +746,9 @@
string text = "";
switch (key)
{
+ case FunctionAttributeKey.Security:
+ text = catchString == "true" ? Language.StringByID(StringId.Defense) : Language.StringByID(StringId.Undefense);
+ break;
case FunctionAttributeKey.OnOff:
text = catchString == "on" ? Language.StringByID(StringId.On) : Language.StringByID(StringId.OFF);
break;
@@ -746,6 +756,7 @@
case FunctionAttributeKey.RoomTemp:
case FunctionAttributeKey.Brightness:
case FunctionAttributeKey.Percent:
+ case FunctionAttributeKey.CCT:
case FunctionAttributeKey.Angle:
int outT = 0;
int.TryParse(catchString, out outT);
--
Gitblit v1.8.0