From f16e7e4df7e7813e4a3052dae752aae3e6937b30 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 08 七月 2022 16:53:12 +0800
Subject: [PATCH] 自研可视对讲、毫米波
---
HDL_ON/Entity/Function/Scene.cs | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/HDL_ON/Entity/Function/Scene.cs b/HDL_ON/Entity/Function/Scene.cs
index 86309f8..e5abff0 100644
--- a/HDL_ON/Entity/Function/Scene.cs
+++ b/HDL_ON/Entity/Function/Scene.cs
@@ -522,6 +522,13 @@
{
//sceneFunctionInfo += new cctState.value + "%" + " ";
}
+
+
+ var perAngle = status.Find((obj) => obj.key == FunctionAttributeKey.Angle);
+ if (perAngle != null)
+ {
+ sceneFunctionInfo += " " + perState.value + "掳";
+ }
return sceneFunctionInfo;
}
@@ -539,6 +546,10 @@
public int max = 0;
public int min = 0;
+ /// <summary>
+ /// 灞炴�х殑鍊煎垪琛�
+ /// </summary>
+ public List<string> valueList = new List<string>();
/// <summary>
/// 灞炴�у悕绉版樉绀烘枃鏈�
/// 涓嫳鏂囨樉绀�
@@ -581,6 +592,9 @@
case FunctionAttributeKey.FadeTime:
text = Language.StringByID(StringId.FadeSpeed);
break;
+ case "angle":
+ text = Language.StringByID(StringId.Angle);
+ break;
}
return text;
}
@@ -610,6 +624,9 @@
case FunctionAttributeKey.CCT:
us = "K";
break;
+ case FunctionAttributeKey.Angle:
+ us = "掳";
+ break;
}
return us;
}
@@ -636,6 +653,7 @@
case FunctionAttributeKey.RoomTemp:
case FunctionAttributeKey.Brightness:
case FunctionAttributeKey.Percent:
+ case FunctionAttributeKey.Angle:
int outT = 0;
int.TryParse(catchString,out outT);
if (outT < 0)
--
Gitblit v1.8.0