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/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 3afc54f..eb1cc55 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -338,7 +338,11 @@
{
if (value == "true")
{
- inputView.btnState.Text = Language.StringByID(StringId.shi);
+ inputView.btnState.Text = Language.StringByID(StringId.youren);
+ }
+ else
+ {
+ inputView.btnState.Text = Language.StringByID(StringId.wuren);
}
}
@@ -1084,6 +1088,25 @@
}
}
break;
+ case SPK.CurtainDream:
+ {
+ string percent = GetKeyValue("percent", dicList);
+ string angle = GetKeyValue("angle", dicList);
+ if (percent != "" && angle != "")
+ {
+ stateStr += Language.StringByID(StringId.onLogic) + percent + "%;";
+ stateStr +=Language.StringByID(StringId.Angle)+angle + "掳";
+ }
+ else if (percent != "")
+ {
+ stateStr = Language.StringByID(StringId.onLogic) + percent + "%";
+ }
+ else if (angle != "")
+ {
+ stateStr = Language.StringByID(StringId.onLogic) + Language.StringByID(StringId.Angle) + angle + "掳";
+ }
+ }
+ break;
case SPK.AcStandard:
case SPK.HvacAC:
{
@@ -1591,6 +1614,39 @@
}
break;
+ case SPK.CurtainDream:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ switch (dic["key"])
+ {
+ case "percent":
+ {
+ if (button1 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ button1.Text = value + "%";
+ }
+ break;
+ case "angle":
+ {
+ if (button2 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ button2.Text = value + "掳";
+ }
+ break;
+ }
+
+ }
+
+ }
+ break;
case SPK.AcStandard:
case SPK.HvacAC:
{
@@ -2005,7 +2061,10 @@
{
if (value == "true")
{
- button1.Text = Language.StringByID(StringId.shi);
+ button1.Text = Language.StringByID(StringId.youren);
+ }
+ else {
+ button1.Text = Language.StringByID(StringId.wuren);
}
}
--
Gitblit v1.8.0