From 90fadf3023d54d780154eaa2a839e2106317297f Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 05 七月 2021 13:38:59 +0800
Subject: [PATCH] 代码合并整理
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 31 ++++++++-----------------------
1 files changed, 8 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 3cbd448..5e24b64 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -69,7 +69,6 @@
}
}
break;
- //姘存蹈浼犳劅鍣�
case SPK.SensorWater:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -86,9 +85,7 @@
}
break;
- //鐑熼浘浼犳劅鍣�
case SPK.SensorSmoke:
- //鐕冩皵浼犳劅鍣�
case SPK.SensorGas:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -105,7 +102,6 @@
}
break;
- //骞叉帴鐐�
case SPK.SensorDryContact:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -122,11 +118,8 @@
}
break;
- //绾㈠鐝婃爮浼犳劅鍣�
case SPK.SensorShanLan:
- //绾㈠瀵瑰皠浼犳劅鍣�
case SPK.SensorDuiShe:
- //绾㈠绉诲姩浼犳劅鍣�
case SPK.SensorPir:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -142,7 +135,6 @@
}
}
break;
- //闂ㄧ獥浼犳劅鍣�
case SPK.SensorDoorWindow:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -158,7 +150,6 @@
}
}
break;
- //瓒呭０娉紶鎰熷櫒
case SPK.SensoruUtrasonic:
{
@@ -184,7 +175,6 @@
}
}
break;
- //姣背娉紶鎰熷櫒
case SPK.SenesorMegahealth:
{
LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -369,7 +359,7 @@
//鏄剧ず鏂囨湰
button.TextID = intValue;
selectedState = device.spk + "_" + value;
- AddDictionary(keyVlaue, value, "string");
+ AddDictionary(keyVlaue, value);
});
@@ -401,34 +391,29 @@
/// </summary>
/// <param name="KeyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
/// <param name="selectedValue">鐘舵�佸��</param>
- /// <param name="data_type">绫诲瀷</param>
- /// <param name="comparator">姣旇緝鍏崇郴</param>
- private void AddDictionary(string KeyValue, string selectedValue,string data_type,string comparator="=")
+ private void AddDictionary(string KeyValue, string selectedValue)
{
//鏁版嵁灏佽
Dictionary<string, string> dic = new Dictionary<string, string>();
LogicMethod.dictionary(dic, "key", KeyValue);
- LogicMethod.dictionary(dic, "comparator", comparator);
- LogicMethod.dictionary(dic, "data_type", data_type);
+ LogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.dictionary(dic, "data_type", "string");
LogicMethod.dictionary(dic, "value", selectedValue);
- AddDictionaryList(KeyValue, comparator,dic);
+ AddDictionaryList(KeyValue, dic);
}
/// <summary>
/// 鏇存柊鏁版嵁鍒楄〃
/// </summary>
- /// <param name="keyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
- /// <param name="comparator">姣旇緝鍏崇郴</param>
+ /// <param name="keyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
/// <param name="dictionary">娣诲姞閫変腑鏁版嵁</param>
/// <returns></returns>
- private void AddDictionaryList(string keyValue,string comparator, Dictionary<string, string> dictionary)
+ private void AddDictionaryList(string keyValue, Dictionary<string, string> dictionary)
{
int indexValue = -1;
for (int i = 0; i < dicSateteList.Count; i++)
{
var dic = dicSateteList[i];
- string key = dic["key"];
- string comparatorValue = dic["comparator"];
- if (key == keyValue && comparatorValue == comparator)
+ if (dic.ContainsValue(keyValue))
{
//鍒ゆ柇鏄惁瀛樺湪
indexValue = i;
--
Gitblit v1.8.0