From 532759ff7c457b6f5a16386570f651eaf01aef3b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 10 十一月 2022 13:19:46 +0800
Subject: [PATCH] 2022年11月10日13:18:58
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 13f4a58..0cb5dd3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -92,7 +92,6 @@
case SPK.LightDimming:
case SPK.LightRGB:
case SPK.LightRGBW:
- case SPK.LightCCT:
{
#region 鐣岄潰
///寮�鍏�
@@ -124,6 +123,54 @@
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
+ }
+ #endregion
+ }
+ break;
+ case SPK.LightCCT:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
+ lightSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(lightSwitchView.FLayoutView());
+ ///浜害
+ LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
+ brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
+ brightnessView.btnText.TextID = StringId.brightnesLogic;
+ fLayout.AddChidren(brightnessView.FLayoutView());
+ brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ ///鑹叉俯
+ LogicView.FunTypeView colorTemperatureView = new LogicView.FunTypeView();
+ colorTemperatureView.frameLayout.Y = brightnessView.frameLayout.Bottom;
+ colorTemperatureView.btnText.TextID = StringId.ColorTemperature;
+ fLayout.AddChidren(colorTemperatureView.FLayoutView());
+ colorTemperatureView.btnState.Text = "2700k";
+ ///璁惧寤舵椂iewv
+ DelayView(fLayout, colorTemperatureView.frameLayout.Bottom);
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, lightSwitchView.btnState, 2);
+ };
+ ///浜害鐐瑰嚮浜嬩欢
+ brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
+
+ };
+ ///鑹叉俯鐐瑰嚮浜嬩欢
+ colorTemperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ ColorTemperatureMethod(device, colorTemperatureView.btnState, colorTemperatureView.btnText.Text);
+
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, colorTemperatureView.btnState, null);
}
#endregion
}
@@ -827,6 +874,38 @@
}
/// <summary>
+ /// 鑹叉俯(cct)=鍔熻兘涓嬩竴绾х晫闈�
+ /// </summary>
+ /// <param name="device"></param>
+ /// <param name="button"></param>
+ private void ColorTemperatureMethod(Entity.Function device, Button button, string titleName)
+ {
+ #region 鐣岄潰
+ //涔嬪墠鐨勭姸鎬佸��
+ string stateVlaue = button.Text;
+ LogicView.ColorTemperature brightness = new LogicView.ColorTemperature();
+ brightness.FLayoutView(this, titleName, stateVlaue, (colorTemperatureValue, unitStr) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ button.Text = colorTemperatureValue + unitStr;
+ selectedState = device.spk + colorTemperatureValue.ToString();
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "";
+ switch (device.spk)
+ {
+ case SPK.LightCCT:
+ {
+ keyVlaue = "cct";
+ }
+ break;
+ }
+ //鏁版嵁灏佽
+ AddDictionary(keyVlaue, colorTemperatureValue);
+ });
+ #endregion
+
+ }
+ /// <summary>
/// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
/// </summary>
/// <param name="device">缂栬緫璁惧</param>
--
Gitblit v1.8.0