From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 01 九月 2023 18:06:45 +0800
Subject: [PATCH] 2023年09月01日18:06:42
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 42 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 193eb02..31916af 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -400,6 +400,13 @@
inputView.btnState.Text = str;
}
break;
+ case SPK.SensorLight:
+ {
+ string str = this.GetText(dicList, "illuminance");
+ inputView.btnState.Text = str;
+
+ }
+ break;
case SPK.DoorLock:
{
string value = this.GetValue(dicList);
@@ -750,6 +757,7 @@
if (device.spk == SPK.SensorEnvironment || device.spk == SPK.SensorEnvironmentHailin
|| device.spk == SPK.SensorEnvironment2
|| device.spk == SPK.SensorEnvironment3
+ || device.spk == SPK.SensorLight
)
{
///褰撳墠鐨勭储寮曞�兼暟鎹璞�
@@ -764,6 +772,20 @@
switch (key)
{
+ case "illuminance":
+ {
+ int titleInt = 0;
+ if (comparator == ">")
+ {
+ titleInt = StringId.zhaomingdugaoyu;
+ }
+ else if (comparator == "<")
+ {
+ titleInt = StringId.zhaomingdudiyu;
+ }
+ ConditionDeviceFunList.Current.InputBoxAction(device, titleInt, indexVulae, true, stateValue);
+ }
+ break;
case "temperature":
{
int titleInt = 0;
@@ -1510,7 +1532,7 @@
}
if (!string.IsNullOrEmpty(volumet))
{
- stateStr += Language.StringByID(StringId.yinliang)+ volumet;
+ stateStr += Language.StringByID(StringId.yinliang) + volumet;
}
if (!string.IsNullOrEmpty(stateStr))
@@ -1519,7 +1541,9 @@
}
if (!string.IsNullOrEmpty(signal))
{
- stateStr += signal.Replace("_", " ");
+ var p = new PublicInterface();
+ string key = p.GetKey(p.GetHisenseSignalSourceDic(), signal);
+ stateStr += key;
}
stateStr = stateStr.TrimEnd(',');
}
@@ -2535,7 +2559,9 @@
//鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
break;
}
- button3.Text = value.Replace("_", " ");
+ var p = new PublicInterface();
+ string key = p.GetKey(p.GetHisenseSignalSourceDic(), value);
+ button3.Text = key;
}
break;
}
@@ -2903,6 +2929,19 @@
switch (key)
{
+ case "illuminance":
+ {
+ if (comparator == ">")
+ {
+ strtext = ">" + value;
+ }
+ else if (comparator == "<")
+ {
+ strtext = "<" + value;
+ }
+
+ }
+ break;
case "temperature":
{
if (comparator == ">")
--
Gitblit v1.8.0