From a46cd0adb5af29e8a9cf47c219475acaedfcf839 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 十二月 2020 17:09:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 161 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 17a2403..c877f26 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -26,12 +26,22 @@
if (string.IsNullOrEmpty(Logic.currlogic.sid))
{
topView.topNameBtn.TextID = StringId.newAutomation;
+ topView.setBtn.Visible = false;
+ topView.clickSetBtn.Visible = false;
}
else
{
topView.topNameBtn.TextID = StringId.editAutomation;
+ topView.setBtn.Visible = true;
+ topView.clickSetBtn.Visible = true;
}
- topView.setBtn.MouseUpEventHandler += (sender,e) => { };
+ topView.clickSetBtn.MouseUpEventHandler += (sender,e) => {
+ Set set = new Set();
+ MainPage.BasePageView.AddChidren(set);
+ set.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ };
VerticalScrolViewLayout viewLayout = new VerticalScrolViewLayout
{
@@ -49,8 +59,19 @@
///婊¤冻浠ヤ笅鏉′欢鐨刅iew
LogicView.LogicTypeTitleView titleCondition = new LogicView.LogicTypeTitleView();
titleCondition.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- titleCondition.btnText.TextID = StringId.whenTheFollowingConditionsAreMet;
+ titleCondition.btnText.TextID = StringId.andCondition;
viewLayout.AddChidren(titleCondition.FLayoutView());
+ titleCondition.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(fLayout);
+ AndOrMethod(fLayout, titleCondition.btnText);
+ };
+
+
// 鏉′欢澶勭悊鏂规硶
InpOrOutLogicMethod.InputCondition(this, viewLayout);
///娣诲姞鍥炬爣鐨刅iew
@@ -141,20 +162,52 @@
this.AddChidren(saveView.FLayoutView());
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- if (string.IsNullOrEmpty(Logic.currlogic.sid))
- {
- Logic.currlogic.sid = LogicMethod.NewSid();
- Logic.LogicList.Add(Logic.currlogic);
- }
- else
- {
- }
- LogicMethod.RemoveAllView();
- MainView.MainShow();
- //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ Logic.currlogic.sid = "000101000000000A0A0100CC1100";
+ //Logic.currlogic.sid = LogicMethod.NewSid();
+ //var f = Send.AddLogic(Logic.currlogic);
+
+ //var a = Send.getLogicIdList();
+
+ //var d = Send.getLogic(Logic.currlogic);
+
+ // var c = Send.delLogic(Logic.currlogic);
+
+ var e1= Send.switchLogic(Logic.currlogic);
+
+
+
+ //if (string.IsNullOrEmpty(Logic.currlogic.sid))
+ //{
+ // List<string> list = new List<string>();
+ // foreach (var logic in Logic.LogicList)
+ // {
+ // list.Add(logic.name);
+ // }
+ // new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
+ // {
+ // Logic.currlogic.name = logicName;
+ // Logic.currlogic.sid = LogicMethod.NewSid();
+ // var responsePackNew = Send.AddLogic(Logic.currlogic);
+ // if (responsePackNew.Code == "0")
+ // {
+ // Logic.LogicList.Add(Logic.currlogic);
+ // LogicMethod.RemoveAllView();
+ // MainView.MainShow();
+ // }
+ // //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+
+ // });
+
+ //}
+ //else
+ //{
+ // LogicMethod.RemoveAllView();
+ // MainView.MainShow();
+ // //鍙戦�佹柊鍔犱慨鏀归�昏緫鍛戒护锛�
+ //}
+
};
- //saveView.frameLayout.Y = this.Height - saveView.frameLayout.Height;
#endregion
}
@@ -523,6 +576,99 @@
};
}
-
+ /// <summary>
+ /// 婊¤冻鏉′欢
+ /// </summary>
+ /// <param name="fLayout">寮规涓绘帶浠�</param>
+ /// <param name="button">鏄剧ず鏂囨湰</param>
+ public void AndOrMethod(FrameLayout fLayout, Button button)
+ {
+ LogicView.DateView meetTheConditionView = new LogicView.DateView();
+ meetTheConditionView.btnTitle.TextID = StringId.meetTheCondition;
+ meetTheConditionView.FLayoutView(fLayout, 2);
+ meetTheConditionView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
+ {
+ fLayout.RemoveFromParent();
+ };
+
+ //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏂囨湰鐘舵��
+ string condition = "";
+ LogicView.SelectTypeView andConditionViews = new LogicView.SelectTypeView();
+ andConditionViews.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
+ andConditionViews.frameLayout.Y = Application.GetRealHeight(56);
+ andConditionViews.btnIcon.Visible = false;
+ andConditionViews.btnText.X = Application.GetRealWidth(20);
+ andConditionViews.btnText.TextID = StringId.andCondition;
+ andConditionViews.btnLine.X = Application.GetRealWidth(20);
+ andConditionViews.btnLine.Width = Application.GetRealWidth(303);
+ andConditionViews.btnNextIcon.X = Application.GetRealWidth(303);
+ andConditionViews.btnNextIcon.Width = Application.GetMinRealAverage(28);
+ andConditionViews.btnNextIcon.Height = Application.GetMinRealAverage(28);
+ andConditionViews.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
+ andConditionViews.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
+ meetTheConditionView.frameLayout.AddChidren(andConditionViews.FLayoutView());
+
+
+ LogicView.SelectTypeView orConditionView = new LogicView.SelectTypeView();
+ orConditionView.frameLayout.BackgroundColor = CSS.CSS_Color.viewTranslucence;
+ orConditionView.frameLayout.Y = Application.GetRealHeight(56 + 50);
+ orConditionView.btnIcon.Visible = false;
+ orConditionView.btnText.X = Application.GetRealWidth(20);
+ orConditionView.btnText.TextID = StringId.orCondition;
+ orConditionView.btnLine.X = Application.GetRealWidth(20);
+ orConditionView.btnLine.Width = Application.GetRealWidth(303);
+ orConditionView.btnNextIcon.X = Application.GetRealWidth(303);
+ orConditionView.btnNextIcon.Width = Application.GetMinRealAverage(28);
+ orConditionView.btnNextIcon.Height = Application.GetMinRealAverage(28);
+ orConditionView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
+ orConditionView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
+ meetTheConditionView.frameLayout.AddChidren(orConditionView.FLayoutView());
+
+
+ if (Logic.currlogic.relation == "and")
+ {
+ andConditionViews.btnNextIcon.IsSelected = true;
+ condition = "and";
+ }
+ else
+ {
+ orConditionView.btnNextIcon.IsSelected = true;
+ condition = "or";
+ }
+ andConditionViews.btnClick.MouseUpEventHandler += (sen1, e) =>
+ {
+ condition = "and";
+ andConditionViews.btnNextIcon.IsSelected = true;
+ orConditionView.btnNextIcon.IsSelected = false;
+ };
+ orConditionView.btnClick.MouseUpEventHandler += (sen1, e) =>
+ {
+ condition = "or";
+ andConditionViews.btnNextIcon.IsSelected = false;
+ orConditionView.btnNextIcon.IsSelected = true;
+ };
+ //纭畾鐐瑰嚮浜嬩欢
+ meetTheConditionView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ {
+ if (string.IsNullOrEmpty(condition))
+ {
+ //鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
+ return;
+ }
+ Logic.currlogic.relation = condition;
+ if (condition == "or")
+ {
+ button.Text = Language.StringByID(StringId.orCondition);
+ }
+ else
+ {
+ button.Text = Language.StringByID(StringId.andCondition);
+ }
+ fLayout.RemoveFromParent();
+ };
+
+ }
+
+
}
}
--
Gitblit v1.8.0