From f7d3739023f4d04a4ed2c30c13d9abf8da210da7 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 25 七月 2022 13:58:49 +0800
Subject: [PATCH] 兼容俄语
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 52 ++++++++++++++++++++++++++++++----------------------
1 files changed, 30 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index 4b7c2fa..1c66bf5 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -68,7 +68,6 @@
lightSwitchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(lightSwitchView.FLayoutView());
-
///璁惧寤舵椂iewv
DelayView(fLayout, lightSwitchView.frameLayout.Bottom);
#endregion
@@ -102,7 +101,7 @@
brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
brightnessView.btnText.TextID = StringId.brightnesLogic;
fLayout.AddChidren(brightnessView.FLayoutView());
- //brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ brightnessView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
///璁惧寤舵椂iewv
DelayView(fLayout, brightnessView.frameLayout.Bottom);
#endregion
@@ -128,19 +127,22 @@
break;
//绐楀笜
case SPK.CurtainSwitch:
+ case SPK.CurtainTrietex:
+ case SPK.CurtainRoller:
{
#region 鐣岄潰
///寮�鍏�
LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
curtainSwitchView.btnText.TextID = StringId.switchLogic;
fLayout.AddChidren(curtainSwitchView.FLayoutView());
+ ///璁惧寤舵椂iewv
DelayView(fLayout, curtainSwitchView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
///寮�鍏崇偣鍑讳簨浠�
curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- SwitchViewMethod(device, curtainSwitchView.btnState, 3);
+ SwitchViewMethod(device, curtainSwitchView.btnState, 2);
};
if (edit)
{
@@ -150,38 +152,39 @@
#endregion
}
break;
- case SPK.CurtainTrietex:
- case SPK.CurtainRoller:
+ case SPK.CurtainDream:
{
#region 鐣岄潰
- ///寮�鍏�
- LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
- curtainSwitchView.btnText.TextID = StringId.switchLogic;
- fLayout.AddChidren(curtainSwitchView.FLayoutView());
///鐧惧垎姣�
LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
- crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
crtainPercentumView.btnText.TextID = StringId.percentum;
fLayout.AddChidren(crtainPercentumView.FLayoutView());
crtainPercentumView.btnState.Text = "5%";//浜у搧缁忕悊鏅撹緣瑕佹眰鏀圭殑 2021-11-06
+ ///瑙掑害
+ LogicView.FunTypeView AngleView = new LogicView.FunTypeView();
+ AngleView.frameLayout.Y = crtainPercentumView.frameLayout.Bottom;
+ AngleView.btnText.TextID = StringId.Angle;
+ fLayout.AddChidren(AngleView.FLayoutView());
+ AngleView.btnState.Text = "10掳";
///璁惧寤舵椂iewv
- DelayView(fLayout, crtainPercentumView.frameLayout.Bottom);
+ DelayView(fLayout, AngleView.frameLayout.Bottom);
#endregion
#region 鐐瑰嚮浜嬩欢
- ///寮�鍏崇偣鍑讳簨浠�
- curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
- {
- SwitchViewMethod(device, curtainSwitchView.btnState, 2);
- };
+
///鐧惧垎姣旂偣鍑讳簨浠�
crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
{
BrightnessMethod(device, crtainPercentumView.btnState, crtainPercentumView.btnText.Text);
};
+ ///瑙掑害鐐瑰嚮浜嬩欢
+ AngleView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, AngleView.btnState, AngleView.btnText.Text);
+ };
if (edit)
{
//鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
- GetEditState(device, index, curtainSwitchView.btnState, crtainPercentumView.btnState, null, null);
+ GetEditState(device, index, crtainPercentumView.btnState, AngleView.btnState, null, null);
}
#endregion
}
@@ -638,19 +641,18 @@
/// <summary>
/// 浜害/鐧惧垎姣�=鍔熻兘涓嬩竴绾х晫闈�
/// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="button">鏄剧ず鐘舵�佸璞�</param>
- /// <param name="titleName">鏍囬</param>
+ /// <param name="device"></param>
+ /// <param name="button"></param>
private void BrightnessMethod(Entity.Function device, Button button, string titleName)
{
#region 鐣岄潰
//涔嬪墠鐨勭姸鎬佸��
string stateVlaue = button.Text;
LogicView.BrightnessView brightness = new LogicView.BrightnessView();
- brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue) =>
+ brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue, unitStr) =>
{
//鐣岄潰鏄剧ず閫変腑鍊�
- button.Text = brightnesValue + "%";
+ button.Text = brightnesValue + unitStr;
selectedState = device.spk + brightnesValue.ToString();
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "";
@@ -667,8 +669,14 @@
break;
case SPK.CurtainRoller:
case SPK.CurtainTrietex:
+ case SPK.CurtainDream:
{
keyVlaue = "percent";
+ if (unitStr == "掳")
+ {
+ //瑙掑害
+ keyVlaue = "angle";
+ }
}
break;
}
--
Gitblit v1.8.0