From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 177 ++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 132 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index ecd18e9..4e8a634 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -47,44 +47,12 @@
#region 缂栬緫璁惧鐘舵��
switch (device.spk)
{
- //寮�鍏崇伅鍏� light.Switch
- case SPK.LightDimming:
- case SPK.LightRGB:
- case SPK.LightRGBW:
- 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());
- #endregion
- #region 鐐瑰嚮浜嬩欢
- ///寮�鍏崇偣鍑讳簨浠�
- lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- SwitchViewMethod(device, lightSwitchView.btnState, 2);
- };
- ///浜害鐐瑰嚮浜嬩欢
- brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
-
- };
- if (edit)
- {
- //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
- GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
- }
- #endregion
- }
- break;
+ //寮�鍏崇伅鍏�
+ case SPK.AirSwitch:
case SPK.LightSwitch:
+ //鎻掑骇
+ case SPK.PanelSocket:
+ case SPK.ElectricSocket:
{
#region 鐣岄潰
///寮�鍏�
@@ -102,6 +70,44 @@
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
GetEditState(device, index, lightSwitchView.btnState, null, null, null);
+ }
+ #endregion
+ }
+ break;
+ //鐏厜寮�鍏� 浜害
+ case SPK.LightDimming:
+ case SPK.LightRGB:
+ case SPK.LightRGBW:
+ 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
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, lightSwitchView.btnState, 2);
+ };
+ ///浜害鐐瑰嚮浜嬩欢
+ brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
+
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
}
#endregion
}
@@ -132,6 +138,7 @@
}
break;
case SPK.AcStandard:
+ case SPK.HvacAC:
{
#region 鐣岄潰
///寮�鍏�
@@ -233,7 +240,7 @@
#endregion
}
break;
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
#region 鐣岄潰
///寮�鍏�
@@ -312,6 +319,89 @@
#endregion
}
break;
+ case SPK.AirFreshStandard:
+ case SPK.HvacAirFresh:
+ {
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView AirFreshSwitchVie = new LogicView.FunTypeView();
+ AirFreshSwitchVie.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(AirFreshSwitchVie.FLayoutView());
+
+ ///椋庨��
+ LogicView.FunTypeView AirFreshSpeedView = new LogicView.FunTypeView();
+ AirFreshSpeedView.frameLayout.Y = AirFreshSwitchVie.frameLayout.Bottom;
+ AirFreshSpeedView.btnText.TextID = StringId.speedLogic;
+ fLayout.AddChidren(AirFreshSpeedView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ AirFreshSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+
+ SwitchViewMethod(device, AirFreshSwitchVie.btnState, 2);
+ };
+ ///椋庨�熺偣鍑讳簨浠�
+ AirFreshSpeedView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ //瀹氫箟涓�涓复鏃跺垪琛�
+ List<string> fanAttrList = new List<string>();
+ //鍔ㄦ�佽鍙栨柊椋庨閫熷垪琛�
+ var fanAttr = device.GetAttribute(FunctionAttributeKey.FanSpeed);
+ foreach (var fanAttrValue in fanAttr.value)
+ {
+ switch (fanAttrValue)
+ {
+ case "high":
+ {
+ fanAttrList.Add(Language.StringByID(StringId.HighWindSpeed));
+ }
+ break;
+ case "medium":
+ {
+ fanAttrList.Add(Language.StringByID(StringId.MiddleWindSpeed));
+ }
+ break;
+ case "low":
+ {
+
+ fanAttrList.Add(Language.StringByID(StringId.LowWindSpeed));
+ }
+ break;
+ case "auto":
+ {
+ fanAttrList.Add(Language.StringByID(StringId.Auto));
+ break;
+ }
+
+ }
+ }
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currText = AirFreshSpeedView.btnState.Text;
+ //璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
+ string keyVlaue = "fan";
+ selectedState = device.spk + "_" + keyVlaue;
+ PublicInterface speedView = new PublicInterface();
+ var speedListStr = fanAttrList;// speedView.GetViewList(keyVlaue);
+ speedView.SingleSelectionShow(this, speedListStr, Language.StringByID(StringId.speedLogic), currText
+ , (stateValue) =>
+ {
+ //鐣岄潰鏄剧ず閫変腑鍊�
+ AirFreshSpeedView.btnState.Text = stateValue;
+ //鏁版嵁灏佽
+ AddDictionary(keyVlaue, speedView.GetModeValueString(stateValue, keyVlaue));
+
+ });
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, AirFreshSwitchVie.btnState, AirFreshSpeedView.btnState, null, null);
+ }
+
+ #endregion
+ }
+ break;
}
#endregion
@@ -354,11 +444,11 @@
}
break;
}
+ case SPK.HvacAC:
case SPK.AcStandard:
- case SPK.FloorHeatStandard:
+ case SPK.FloorHeatStandard:case SPK.HvacFloorHeat:
{
-
- //(绌鸿皟/鍦扮儹)鍋氫簡涓�涓壒娈婂鐞嗭紱
+ //鍋氫簡涓�涓壒娈婂鐞嗭紱
bool _bool = false;
for (int i = 0; i < dicSateteList.Count; i++)
{
@@ -378,10 +468,9 @@
diction.Add("value", "on");
dicSateteList.Add(diction);
}
-
-
}
break;
+
}
outputDevice.status = dicSateteList;
@@ -600,8 +689,6 @@
}
}
-
-
}
}
--
Gitblit v1.8.0