From 307e554fb2ef6491d08afc58a6c0a852f44b4f46 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 01 十二月 2020 17:04:50 +0800
Subject: [PATCH] 2020-12-01-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/DeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs
similarity index 92%
rename from HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/DeviceFunList.cs
rename to HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs
index 05451be..e6e5698 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Automation/DeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs
@@ -37,6 +37,8 @@
List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
//瀹氫箟涓�涓彉閲忥紝璁板綍閫変腑鐘舵��
string selectedState = "unknown";
+ //瀹氫箟涓�涓彉閲忥紝璁板綍閫変腑鐘舵�佽褰曞睘鎬�
+ string keyVlaue = "";
switch (device.functionType)
{
//寮�鍏崇伅鍏�
@@ -98,16 +100,31 @@
switchView.frameLayout.AddChidren(btnOff);
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", "on_off");
- LogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.dictionary(dic, "data_type", "string");
+ switch (if_type)
+ {
+ case LogicMethod.condition_if:
+ {
+ LogicMethod.dictionary(dic, "key", "on_off");
+ LogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.dictionary(dic, "data_type", "string");
+ keyVlaue = "on_off";
+ }
+ break;
+ case LogicMethod.target_if:
+ {
+ LogicMethod.dictionary(dic, "key", "on_off");
+ keyVlaue = "on_off";
+ }
+ break;
+ }
+
btnOn.MouseUpEventHandler += (sender2, e2) =>
{
LogicMethod.dictionary(dic, "value", "on");
RemView(relayFunView);
relayView.btnState.TextID = StringId.onLogic;
selectedState = device.functionType + "_on";
- AddDictionaryData(dicSateteList, "on_off", dic);
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
};
btnOff.MouseUpEventHandler += (sender3, e3) =>
{
@@ -115,7 +132,7 @@
RemView(relayFunView);
relayView.btnState.TextID = StringId.offLogic;
selectedState = device.functionType + "_off";
- AddDictionaryData(dicSateteList, "on_off", dic);
+ AddDictionaryData(dicSateteList, keyVlaue, dic);
};
if (relayView.btnState.Text != "")
--
Gitblit v1.8.0