From c29cd36f584338731704b1eaf3d34ea47908e0e5 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 22 十二月 2020 13:38:39 +0800
Subject: [PATCH] 2020-12-22-3
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index a7be412..010aa10 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -481,10 +481,10 @@
{
//绉婚櫎鍒楄〃鎵�鏈夋暟鎹�
dicSateteList.Clear();
- //閲嶆柊娣诲姞寮�鍏夊睘鎬ф暟鎹�
+ //閲嶆柊娣诲姞-鍏�-灞炴�ф暟鎹�
Dictionary<string, string> diction = new Dictionary<string, string>();
diction.Add("key", "on_off");
- diction.Add("value", "on_off");
+ diction.Add("value", "off");
dicSateteList.Add(diction);
break;
}
@@ -493,6 +493,34 @@
}
break;
}
+ case FunctionType.AC:
+ case FunctionType.FloorHeating:
+ {
+
+ //(绌鸿皟/鍦扮儹)鍋氫簡涓�涓壒娈婂鐞嗭紱
+ bool _bool = false;
+ for (int i = 0; i < dicSateteList.Count; i++)
+ {
+ var dic = dicSateteList[i];
+ if (dic.ContainsValue("on_off"))
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ _bool = true;
+ break;
+ }
+ }
+ if (!_bool)
+ {
+ //娌℃湁寮�鍏冲氨榛樿娣诲姞-寮�-灞炴��
+ Dictionary<string, string> diction = new Dictionary<string, string>();
+ diction.Add("key", "on_off");
+ diction.Add("value", "on");
+ dicSateteList.Add(diction);
+ }
+
+
+ }
+ break;
}
outputDevice.status = dicSateteList;
@@ -739,7 +767,7 @@
LogicView.BrightnessView brightness = new LogicView.BrightnessView();
brightness.FLayoutView(frame, titleName, button.Text, (brightnesValue) =>
{
- button.Text = brightnesValue;
+ button.Text = brightnesValue+"%";
Dictionary<string, string> dic = new Dictionary<string, string>();
string keyVlaue = "";
switch (device.functionType)
@@ -841,7 +869,7 @@
case "brightness":
{
- button2.Text = value;
+ button2.Text = value+"%";
}
break;
}
--
Gitblit v1.8.0