From 41f9c8837b0551c68f8fd798c06951fa716b7ab8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:05:29 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs | 165 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 113 insertions(+), 52 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
index cf96fe7..8c7a270 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/TargetDeviceFunList.cs
@@ -1,4 +1,4 @@
-锘縰sing System;
+using System;
using Shared;
using System.Collections.Generic;
using HDL_ON.Entity;
@@ -53,14 +53,57 @@
case SPK.LightRGBW:
case SPK.LightCCT:
{
- //2琛ㄧず(寮�锛屽叧)鍔熻兘
- SwitchBrightnessView(fLayout, device, index, edit, 2);
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
+ lightSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(lightSwitchView.FLayoutView());
+ ///浜害
+ LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
+ brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
+ brightnessView.btnText.TextID = StringId.brightnesLogic;
+ fLayout.AddChidren(brightnessView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, lightSwitchView.btnState, 2);
+ };
+ ///浜害鐐瑰嚮浜嬩欢
+ brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
+
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
+ }
+ #endregion
}
break;
case SPK.LightSwitch:
{
- //2琛ㄧず(寮�锛屽叧)鍔熻兘
- SwitchView(fLayout, device, index, edit, 2);
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
+ lightSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(lightSwitchView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, lightSwitchView.btnState, 2);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, lightSwitchView.btnState, null, null, null);
+ }
+ #endregion
}
break;
//绐楀笜
@@ -68,8 +111,24 @@
case SPK.CurtainTrietex:
case SPK.CurtainRoller:
{
- //3琛ㄧず(寮�锛屽叧锛屾殏鍋�)鍔熻兘
- SwitchView(fLayout, device, index, edit, 3);
+ #region 鐣岄潰
+ ///寮�鍏�
+ LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
+ curtainSwitchView.btnText.TextID = StringId.switchLogic;
+ fLayout.AddChidren(curtainSwitchView.FLayoutView());
+ #endregion
+ #region 鐐瑰嚮浜嬩欢
+ ///寮�鍏崇偣鍑讳簨浠�
+ curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ SwitchViewMethod(device, curtainSwitchView.btnState, 3);
+ };
+ if (edit)
+ {
+ //鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
+ }
+ #endregion
}
break;
case SPK.AcStandard:
@@ -109,19 +168,18 @@
{
///涔嬪墠鐨勭姸鎬佹枃鏈�
string tempValue = temperatureView.btnState.Text;
- LogicView.TemperatureView tempView= new LogicView.TemperatureView();
- tempView.FLayoutView(this, tempValue,(stateStr)=> {
+ LogicView.TemperatureView tempView = new LogicView.TemperatureView();
+ tempView.FLayoutView(this, tempValue, (stateStr) =>
+ {
//鐣岄潰鏄剧ず閫変腑鍊�
temperatureView.btnState.Text = stateStr;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "set_temp";
selectedState = device.spk + "_"+ keyVlaue;
+
string set_temp_value = stateStr.Replace("鈩�", "");
//鏁版嵁灏佽
- Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", keyVlaue);
- LogicMethod.dictionary(dic, "value", set_temp_value);
- AddDictionaryData(dicSateteList, keyVlaue, dic);
+ AddDictionary(keyVlaue, set_temp_value);
});
@@ -135,18 +193,14 @@
string keyVlaue = "mode";
selectedState = device.spk + "_"+keyVlaue;
PublicInterface modeView = new PublicInterface();
- var modeListStr= modeView.GetViewList(keyVlaue);
+ var modeListStr = modeView.GetViewList(keyVlaue);
modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
, (stateValue) =>
{
//鐣岄潰鏄剧ず閫変腑鍊�
acModehView.btnState.Text = stateValue;
//鏁版嵁灏佽
- Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", keyVlaue);
- LogicMethod.dictionary(dic, "value", modeView.GetModeValueString(stateValue, keyVlaue));
- AddDictionaryData(dicSateteList, keyVlaue, dic);
-
+ AddDictionary(keyVlaue, modeView.GetModeValueString(stateValue, keyVlaue));
});
};
@@ -167,10 +221,7 @@
//鐣岄潰鏄剧ず閫変腑鍊�
acSpeedView.btnState.Text = stateValue;
//鏁版嵁灏佽
- Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", keyVlaue);
- LogicMethod.dictionary(dic, "value", speedView.GetModeValueString(stateValue, keyVlaue));
- AddDictionaryData(dicSateteList, keyVlaue, dic);
+ AddDictionary(keyVlaue, speedView.GetModeValueString(stateValue, keyVlaue));
});
};
@@ -209,6 +260,7 @@
///寮�鍏崇偣鍑讳簨浠�
floorHeatingSwitchVie.btnClick.MouseUpEventHandler += (sender, e) =>
{
+
SwitchViewMethod(device, floorHeatingSwitchVie.btnState, 2);
};
///娓╁害鐐瑰嚮浜嬩欢
@@ -216,7 +268,8 @@
{
string tempValue = temperatureView.btnState.Text;
LogicView.TemperatureView tempView = new LogicView.TemperatureView();
- tempView.FLayoutView(this, tempValue, (stateStr) => {
+ tempView.FLayoutView(this, tempValue, (stateStr) =>
+ {
//鐣岄潰鏄剧ず閫変腑鍊�
temperatureView.btnState.Text = stateStr;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
@@ -224,25 +277,21 @@
selectedState = device.spk + "_"+ keyVlaue;
string set_temp_value = stateStr.Replace("鈩�", "");
//鏁版嵁灏佽
- Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", keyVlaue);
- LogicMethod.dictionary(dic, "value", set_temp_value);
- AddDictionaryData(dicSateteList, keyVlaue, dic);
+ AddDictionary(keyVlaue, set_temp_value);
});
-
+
};
///妯″紡鐐瑰嚮浜嬩欢
floorHeatingModehView.btnClick.MouseUpEventHandler += (sender, e) =>
{
-
-
+
+
///涔嬪墠鐨勭姸鎬佹枃鏈�
- string currText= floorHeatingModehView.btnState.Text;
+ string currText = floorHeatingModehView.btnState.Text;
//璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�;
string keyVlaue = "mode";
selectedState = device.spk + "_"+ keyVlaue;
-
PublicInterface modeView = new PublicInterface();
var modeListStr = modeView.GetViewList("floorheatingmode");
modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
@@ -251,10 +300,7 @@
//鐣岄潰鏄剧ず閫変腑鍊�
floorHeatingModehView.btnState.Text = stateValue;
//鏁版嵁灏佽
- Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", keyVlaue);
- LogicMethod.dictionary(dic, "value", modeView.GetModeValueString(stateValue, "floorheatingmode"));
- AddDictionaryData(dicSateteList, keyVlaue, dic);
+ AddDictionary(keyVlaue, modeView.GetModeValueString(stateValue, "floorheatingmode"));
});
};
@@ -273,8 +319,6 @@
#region 淇濆瓨鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sen, e) =>
{
-
-
if (selectedState != "unknown")
{
Output outputDevice = new Output();
@@ -471,17 +515,23 @@
switchView.FLayoutView(frame, len, button.Text, (Action<string>)((strValue) =>
{
int id = 0;
- switch (strValue) {
- case "on": {
+ switch (strValue)
+ {
+ case "on":
+ {
id = StringId.onLogic;
}
break;
- case "off": {
+ case "off":
+ {
id = StringId.offLogic;
- } break;
- case "stop": {
+ }
+ break;
+ case "stop":
+ {
id = StringId.stop;
- } break;
+ }
+ break;
}
//鐣岄潰鏄剧ず閫変腑鍊�
button.TextID = id;
@@ -523,14 +573,12 @@
case SPK.LightRGBW:
case SPK.LightCCT:
{
- LogicMethod.dictionary(dic, "key", "brightness");
keyVlaue = "brightness";
}
break;
case SPK.CurtainTrietex:
case SPK.CurtainRoller:
{
- LogicMethod.dictionary(dic, "key", "percent");
keyVlaue = "percent";
}
break;
@@ -564,13 +612,26 @@
InpOrOutLogicMethod.EditState(device, dicList, button1, button2, button3, button4);
}
/// <summary>
- /// 娣诲姞澶勭悊閫変腑鏁版嵁
+ /// 娣诲姞閫変腑鏁版嵁
/// </summary>
- /// <param name="dicList">瀛樺偍鏁版嵁鍒楄〃</param>
- /// <param name="keyValue">璇嗗埆璁惧</param>
+ /// <param name="KeyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
+ /// <param name="selectedValue">鐘舵�佸��</param>
+ private void AddDictionary(string KeyValue, string selectedValue)
+ {
+ //鏁版嵁灏佽
+ Dictionary<string, string> dic = new Dictionary<string, string>();
+ LogicMethod.dictionary(dic, "key", KeyValue);
+ LogicMethod.dictionary(dic, "value", selectedValue);
+ AddDictionaryList(KeyValue, dic, dicSateteList);
+ }
+ /// <summary>
+ /// 鏇存柊鏁版嵁鍒楄〃
+ /// </summary>
+ /// <param name="keyValue">璁惧灞炴�у�硷紝浜戦泙涓婂畾涔夊ソ鐨�</param>
/// <param name="dictionary">閫変腑鏁版嵁</param>
+ /// <param name="dicList">瀛樺偍鏁版嵁鍒楄〃</param>
/// <returns></returns>
- private void AddDictionaryData(List<Dictionary<string, string>> dicList, string keyValue, Dictionary<string, string> dictionary)
+ private void AddDictionaryList(string keyValue, Dictionary<string, string> dictionary, List<Dictionary<string, string>> dicList)
{
int indexValue = -1;
for (int i = 0; i < dicList.Count; i++)
@@ -625,7 +686,7 @@
}
}
-
+
}
--
Gitblit v1.8.0