From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs | 269 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 239 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs
index 929669b..05451be 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/DeviceFunList.cs
@@ -9,9 +9,14 @@
{
Tag = "Logic";
}
-
- public void Show(Entity.Function device)
+ /// <summary>
+ /// 琛ㄧず鏄�(鏉′欢/鐩爣)
+ /// </summary>
+ private string if_type;
+ public void Show(Entity.Function device, int index, bool edit, string str)
{
+ if_type = str;
+ #region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
LogicView.TopView topView = new LogicView.TopView();
this.AddChidren(topView.FLayoutView());
@@ -27,12 +32,11 @@
Height = Application.GetRealHeight(667 - 64),
};
this.AddChidren(fLayout);
-
- Input inputdevice = new Input();
- inputdevice.condition_type = "3";
- inputdevice.sid = device.sid;
-
-
+ #endregion
+ //瀹氫箟涓�涓褰曢�変腑璁惧鐘舵�佸垪琛紱
+ List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
+ //瀹氫箟涓�涓彉閲忥紝璁板綍閫変腑鐘舵��
+ string selectedState = "unknown";
switch (device.functionType)
{
//寮�鍏崇伅鍏�
@@ -46,11 +50,12 @@
relayView.btnState.Visible = true;
relayView.btnText.TextSize = LogicView.TextSize.text16;
relayView.btnText.Height = Application.GetRealHeight(22);
- relayView.btnText.TextID =StringId.switchLogic;
+ relayView.btnText.TextID = StringId.switchLogic;
relayView.btnText.X = Application.GetRealWidth(16);
- relayView.btnText.Width= Application.GetRealWidth(130);
+ relayView.btnText.Width = Application.GetRealWidth(130);
relayView.btnLine.X = Application.GetRealWidth(16);
relayView.btnLine.Width = Application.GetRealWidth(343);
+ relayView.btnState.Text = "";
fLayout.AddChidren(relayView.FLayoutView());
relayView.btnClick.MouseUpEventHandler += (sender, e) =>
{
@@ -61,7 +66,7 @@
this.AddChidren(relayFunView);
LogicView.SwitchView switchView = new LogicView.SwitchView();
switchView.FLayoutView(relayFunView, 2);
-
+
Button btnOn = new Button
{
TextAlignment = TextAlignment.Center,
@@ -70,6 +75,7 @@
TextID = StringId.onLogic,
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(343),
+
};
switchView.frameLayout.AddChidren(btnOn);
Button btnLine = new Button
@@ -95,19 +101,40 @@
LogicMethod.dictionary(dic, "key", "on_off");
LogicMethod.dictionary(dic, "comparator", "=");
LogicMethod.dictionary(dic, "data_type", "string");
- inputdevice.condition.Add(dic);
- btnOn.MouseUpEventHandler += (sender2, e2) => {
+ 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);
};
- btnOff.MouseUpEventHandler += (sender3, e3) => {
+ btnOff.MouseUpEventHandler += (sender3, e3) =>
+ {
LogicMethod.dictionary(dic, "value", "off");
RemView(relayFunView);
relayView.btnState.TextID = StringId.offLogic;
+ selectedState = device.functionType + "_off";
+ AddDictionaryData(dicSateteList, "on_off", dic);
};
+ if (relayView.btnState.Text != "")
+ {
+ if (relayView.btnState.Text == btnOn.Text)
+ {
+ btnOn.TextColor = CSS.CSS_Color.textConfirmColor;
+ }
+ else
+ {
+ btnOff.TextColor = CSS.CSS_Color.textConfirmColor;
+ }
+ }
+
};
+ if (edit)
+ {
+ GetEditState(device, edit, index, relayView.btnState, null, null, null);
+ }
}
break;
@@ -124,22 +151,63 @@
this.AddChidren(saveView.FLayoutView());
saveView.btnClick.MouseUpEventHandler += (sen, e) =>
{
- //if (edit)
- //{
- // //绉婚櫎鏃ф暟鎹�
- // Logic.currlogic.input.RemoveAt(index);
- // //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�;
- // Logic.currlogic.input.Insert(index, inputdevice);
- //}
- //else
- //{
- // //娣诲姞涓�涓柊鐨勬椂闂寸偣鏉′欢
- // Logic.currlogic.input.Add(inputdevice);
- //}
- //娣诲姞涓�涓柊鐨勬椂闂寸偣鏉′欢
- Logic.currlogic.input.Add(inputdevice);
- RemoveViewByTag("Logic");
+
+ if (selectedState != "unknown")
+ {
+ if (if_type == LogicMethod.condition_if)
+ {
+
+ Input inputDevice = new Input();
+ inputDevice.condition_type = "3";
+ inputDevice.sid = device.sid;
+ inputDevice.condition = dicSateteList;
+
+
+ if (edit)
+ {
+ //绉婚櫎鏃ф暟鎹�
+ Logic.currlogic.input.RemoveAt(index);
+ //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�;
+ Logic.currlogic.input.Insert(index, inputDevice);
+ }
+ else
+ {
+ //娣诲姞涓�涓潯浠�
+ AddCondition(inputDevice);
+ }
+ }
+ else
+ {
+ Output outputDevice = new Output();
+ outputDevice.target_type = "1";
+ outputDevice.sid = device.sid;
+ outputDevice.status = dicSateteList;
+ if (edit)
+ {
+ //绉婚櫎鏃ф暟鎹�
+ Logic.currlogic.output.RemoveAt(index);
+ //鏂版暟鎹彃鍏ユ棫鏁版嵁鐨勪綅缃�;
+ Logic.currlogic.output.Insert(index, outputDevice);
+ }
+ else
+ {
+ //娣诲姞涓�涓潯浠�
+ AddTarget(outputDevice);
+ }
+ }
+ }
+ else
+ {
+ if (!edit)
+ {
+ //鎻愮ず鐢ㄦ埛
+ return;
+ }
+ this.RemoveFromParent();
+ return;
+ }
+ LogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
@@ -153,8 +221,149 @@
/// 绉婚櫎鎺т欢
/// </summary>
/// <param name="frame"></param>
- public void RemView(FrameLayout frame) {
+ private void RemView(FrameLayout frame)
+ {
frame.RemoveFromParent();
}
+ /// <summary>
+ /// 鏄剧ず缂栬緫涔嬪墠鐨勮澶囩姸鎬�
+ /// </summary>
+ /// <param name="device">缂栬緫璁惧</param>
+ /// <param name="edit">缂栬緫鐘舵��</param>
+ /// <param name="index">缂栬緫鏁版嵁鐨勭储寮�</param>
+ /// <param name="button1">鏄剧ずBtn</param>
+ /// <param name="button2">鏄剧ずBtn</param>
+ /// <param name="button3">鏄剧ずBtn</param>
+ /// <param name="button4">鏄剧ずBtn</param>
+ private void GetEditState(Entity.Function device, bool edit, int index, Button button1, Button button2, Button button3, Button button4)
+ {
+ var dicList = new List<Dictionary<string, string>>();
+ switch (if_type)
+ {
+ case LogicMethod.condition_if:
+ {
+ Input inputs = Logic.currlogic.input[index];
+ dicList = inputs.condition as List<Dictionary<string, string>>;
+ }
+ break;
+ case LogicMethod.target_if:
+ {
+ Output outputs = Logic.currlogic.output[index];
+ dicList = outputs.status as List<Dictionary<string, string>>;
+ }
+ break;
+ }
+ switch (device.functionType)
+ {
+ //寮�鍏崇伅鍏�
+ case FunctionType.Relay:
+ {
+ foreach (var dic in dicList)
+ {
+ string value = dic["value"];
+ if (value == "on")
+ {
+ button1.Text = Language.StringByID(StringId.onLogic);
+ }
+ else
+ {
+ button1.Text = Language.StringByID(StringId.offLogic);
+ }
+ }
+ }
+ break;
+
+ }
+
+ }
+ /// <summary>
+ /// 娣诲姞閫変腑鏁版嵁
+ /// </summary>
+ /// <param name="dicList">鏁版嵁鍒楄〃</param>
+ /// <param name="keyValue">璇嗗埆璁惧</param>
+ /// <param name="dictionary">閫変腑鏁版嵁</param>
+ /// <returns></returns>
+ private void AddDictionaryData(List<Dictionary<string, string>> dicList, string keyValue, Dictionary<string, string> dictionary)
+ {
+ int indexValue = -1;
+ for (int i = 0; i < dicList.Count; i++)
+ {
+ var dic = dicList[i];
+ if (dic.ContainsValue(keyValue))
+ {
+ //鍒ゆ柇鏄惁瀛樺湪
+ indexValue = i;
+ break;
+ }
+ }
+
+ if (indexValue != -1)
+ {
+ //瀛樺湪绉婚櫎
+ dicList.RemoveAt(indexValue);
+ //閲嶆柊娣诲姞
+ dicList.Insert(indexValue, dictionary);
+ }
+ else
+ {
+ //鏂版坊鍔�
+ dicList.Add(dictionary);
+ }
+
+ }
+ /// <summary>
+ /// 娣诲姞鏉′欢
+ /// </summary>
+ /// <param name="input"></param>
+ private void AddCondition(Input input)
+ {
+ int indexValue = -1;
+ for (int i = 0; i < Logic.currlogic.input.Count; i++)
+ {
+ if (Logic.currlogic.input[i].sid == input.sid)
+ {
+ indexValue = i;
+ break;
+ }
+ }
+
+ if (indexValue != -1)
+ {
+ Logic.currlogic.input.RemoveAt(indexValue);
+ Logic.currlogic.input.Insert(indexValue, input);
+ }
+ else
+ {
+ Logic.currlogic.input.Add(input);
+ }
+
+ }
+ /// <summary>
+ /// 娣诲姞鐩爣
+ /// </summary>
+ /// <param name="target"></param>
+ private void AddTarget(Output target)
+ {
+ int indexValue = -1;
+ for (int i = 0; i < Logic.currlogic.output.Count; i++)
+ {
+ if (Logic.currlogic.output[i].sid == target.sid)
+ {
+ indexValue = i;
+ break;
+ }
+ }
+
+ if (indexValue != -1)
+ {
+ Logic.currlogic.output.RemoveAt(indexValue);
+ Logic.currlogic.output.Insert(indexValue, target);
+ }
+ else
+ {
+ Logic.currlogic.output.Add(target);
+ }
+
+ }
}
}
--
Gitblit v1.8.0