From 607e4db3b1a4ad059fc8d719117dab7eae9f20d2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 19 七月 2023 09:48:51 +0800
Subject: [PATCH] Merge branch 'wjc' into Dev-1.9
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 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 4b268ed..805c245 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1098,9 +1098,28 @@
stateStr += "," +GetKeyValue("cct", dicList) + "k";
}
}
+ if (device.spk == SPK.LightRGB)
+ {
+ string rgb = GetKeyValue("rgb", dicList);
+ if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
+ {
+ targetView.btnStateColor.Visible = true;
+ targetView.btnStateColor.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(rgb);
+ }
+ }
+ if (device.spk == SPK.LightRGBW)
+ {
+ string rgb = GetKeyValue("rgbw", dicList);
+ if (!string.IsNullOrEmpty(rgb) && rgb.Length > 6)
+ {
+ targetView.btnStateColor.Visible = true;
+ targetView.btnStateColor.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(rgb);
+ }
+ }
}
break;
+
case SPK.CurtainSwitch:
{
foreach (var dic in dicList)
@@ -1197,8 +1216,12 @@
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state;
- stateStr += set_temp + unit+",";
+ string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
+ if (string.IsNullOrEmpty(unit))
+ {
+ unit = "鈩�";
+ }
+ stateStr += set_temp + unit + ",";
}
if (mode != "")
@@ -1295,7 +1318,11 @@
}
if (set_temp != "")
{
- string unit = device.GetAttribute("temperature_type") == null ? "掳" : device.GetAttribute("temperature_type").state;
+ string unit = device.GetAttribute("temperature_type") == null ? "鈩�" : device.GetAttribute("temperature_type").state;
+ if (string.IsNullOrEmpty(unit))
+ {
+ unit = "鈩�";
+ }
stateStr += set_temp + unit + ",";
}
if (mode != "")
@@ -1641,6 +1668,22 @@
button3.Text = value + "k";
}
break;
+ case "rgb":
+ case "rgbw":
+ {
+ if (button3 == null)
+ {
+ //鎬曡皟璇曡蒋浠朵贡涓婁笢瑗垮鑷存姏寮傚父
+ break;
+ }
+ if (!string.IsNullOrEmpty(value) && value.Length > 6)
+ {
+ button3.BackgroundColor = new LogicView.RGBColorView().GetBackgroundColor(value);
+ button3.Tag = value;
+ }
+ }
+ break;
+
}
}
--
Gitblit v1.8.0