From 0131f1fdda0189508264f540d600b46f40411d30 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 07 六月 2023 15:57:25 +0800
Subject: [PATCH] 场景温度单位更新
---
HDL_ON/Entity/Function/Scene.cs | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 99d3a86..48fa113 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"))
{
@@ -620,7 +624,7 @@
var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
if (perAngle != null)
{
- sceneFunctionInfo += " " + perState.value + "掳";
+ sceneFunctionInfo += " " + perAngle.value + "掳";
}
return sceneFunctionInfo;
}
@@ -688,22 +692,26 @@
case "angle":
text = Language.StringByID(StringId.Angle);
break;
+ case "security":
+ text = Language.StringByID(StringId.DeploymentStatus);
+ break;
}
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:
@@ -739,6 +747,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 +757,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