From f4c86f68b900bd506ef7214b2ae9bd23a9d2ffa8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期六, 19 十二月 2020 17:48:11 +0800
Subject: [PATCH] 完成筛选房间的功能
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
old mode 100644
new mode 100755
index 01a8209..00271c2
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -49,7 +49,7 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
{
//2琛ㄧず(寮�锛屽叧)鍔熻兘
SwitchBrightnessView(fLayout, device, index, edit, 2);
@@ -68,8 +68,8 @@
SwitchView(fLayout, device, index, edit, 3);
}
break;
- case FunctionType.TrietexCurtain:
- case FunctionType.RollerCurtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
//3琛ㄧず(寮�锛屽叧锛屾殏鍋�)鍔熻兘
SwitchBrightnessView(fLayout, device, index, edit, 3);
@@ -278,7 +278,7 @@
speedTypeView.btnText.Text = speedStr[i];
speedTypeView.btnClick.Tag = speedStr[i];//鏍囪
- if (acModehView.btnState.Text == speedStr[i])
+ if (acSpeedView.btnState.Text == speedStr[i])
{
//鏄剧ず涔嬪墠鐨勯�変腑鐘舵��
checkBtn.IsSelected = false;
@@ -664,7 +664,7 @@
///浜害
LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
- if (device.functionType == FunctionType.TrietexCurtain || device.functionType == FunctionType.RollerCurtain)
+ if (device.functionType == FunctionType.MotorCurtain || device.functionType == FunctionType.RollingShutter)
{
brightnessView.btnText.TextID = StringId.percentum;
@@ -887,7 +887,7 @@
case FunctionType.Dimmer:
case FunctionType.RGB:
case FunctionType.RGBW:
- case FunctionType.CCT:
+ case FunctionType.ColorTemperature:
{
foreach (var dic in dicList)
{
@@ -943,8 +943,8 @@
}
}
break;
- case FunctionType.TrietexCurtain:
- case FunctionType.RollerCurtain:
+ case FunctionType.MotorCurtain:
+ case FunctionType.RollingShutter:
{
foreach (var dic in dicList)
--
Gitblit v1.8.0