From d7094fc4ff54ada4c39868c8be1907e0a1c25b32 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十二月 2020 09:10:58 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 313 ++++++++++++++++-----------------------------------
1 files changed, 101 insertions(+), 212 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 4f2c328..426ebe3 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -14,7 +14,7 @@
public void Show()
{
-
+ #region 鐣岄潰甯冨眬
this.BackgroundColor = CSS.CSS_Color.viewMiddle;
LogicView.TopView topView = new LogicView.TopView();
topView.setBtn.Visible = true;
@@ -35,14 +35,7 @@
topView.setBtn.Visible = true;
topView.clickSetBtn.Visible = true;
}
- 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
{
@@ -62,16 +55,16 @@
titleCondition.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
titleCondition.btnText.TextID = StringId.andCondition;
viewLayout.AddChidren(titleCondition.FLayoutView());
- titleCondition.btnClick.MouseUpEventHandler += (sender, e) =>
+
+ if (Logic.currlogic.relation == "and")
{
- FrameLayout fLayout = new FrameLayout
- {
- BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
- };
- this.AddChidren(fLayout);
- AndOrMethod(fLayout, titleCondition.btnText);
- };
+ titleCondition.btnText.Text = Language.StringByID(StringId.andCondition);
+ }
+ else
+ {
+ titleCondition.btnText.Text = Language.StringByID(StringId.orCondition);
+ }
// 鏉′欢澶勭悊鏂规硶
InpOrOutLogicMethod.InputCondition(this, viewLayout);
@@ -79,14 +72,6 @@
LogicView.LogicAddView addInputIcon = new LogicView.LogicAddView();
addInputIcon.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
viewLayout.AddChidren(addInputIcon.FLayoutView());
-
- addInputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
- {
- var addInputType = new AddInputType();
- MainPage.BasePageView.AddChidren(addInputType);
- addInputType.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
#endregion
#region 鐩爣
@@ -106,13 +91,7 @@
LogicView.LogicAddView addOutputIcon = new LogicView.LogicAddView();
addOutputIcon.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
viewLayout.AddChidren(addOutputIcon.FLayoutView());
- addOutputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
- {
- var addTarget = new AddTarget();
- MainPage.BasePageView.AddChidren(addTarget);
- addTarget.Show();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- };
+
#endregion
#region 寰幆鏂瑰紡
@@ -126,13 +105,7 @@
cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
cyclicTitle.btnText.Text = MainView.GetWeekText(Logic.currlogic);
viewLayout.AddChidren(cyclicTitle.FLayoutView());
- cyclicTitle.btnClick.MouseUpEventHandler += (sender, e) =>
- {
-
- DateMethod(cyclicTitle.btnText);
-
-
- };
+
#endregion
#region 鎵ц鎺ㄩ�� 鍙戦�侀�氱煡
@@ -163,6 +136,52 @@
LogicView.SaveView saveView = new LogicView.SaveView();
saveView.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(24), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
this.AddChidren(saveView.FLayoutView());
+
+ #endregion
+#endregion
+
+ #region 鐣岄潰鍚勭鐐瑰嚮浜嬩欢
+ ///璁剧疆鍥炬爣鐐瑰嚮浜嬩欢
+ topView.clickSetBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ Set set = new Set();
+ MainPage.BasePageView.AddChidren(set);
+ set.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
+ };
+ ///鎴栧拰涓庣偣鍑讳簨浠�
+ titleCondition.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ };
+ this.AddChidren(fLayout);
+ AndOrMethod(fLayout, titleCondition.btnText);
+ };
+ ///鏉′欢鐐瑰嚮浜嬩欢
+ addInputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
+ {
+ var addInputType = new AddInputType();
+ MainPage.BasePageView.AddChidren(addInputType);
+ addInputType.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ ///鐩爣鐐瑰嚮浜嬩欢
+ addOutputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
+ {
+ var addTarget = new AddTarget();
+ MainPage.BasePageView.AddChidren(addTarget);
+ addTarget.Show();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ ///寰幆鏂瑰紡鐐瑰嚮浜嬩欢
+ cyclicTitle.btnClick.MouseUpEventHandler += (sender, e) =>
+ {
+ DateMethod(cyclicTitle.btnText);
+ };
+ ///淇濆瓨鐐瑰嚮浜嬩欢
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
if (string.IsNullOrEmpty(Logic.currlogic.userLogicId))
@@ -209,7 +228,6 @@
};
#endregion
-
}
/// <summary>
/// 寰幆鏂瑰紡(姣忓ぉ锛屾瘡鏈堛�傘��)
@@ -300,13 +318,11 @@
break;
case 2:
{
- // weekName = Language.StringByID(StringId.weekly);
WeekMethod(fLayout, button);
}
break;
case 3:
{
- //weekName = Language.StringByID(StringId.monthly);
MonMethod(fLayout, button);
}
break;
@@ -393,97 +409,15 @@
/// <param name="button">鏄剧ず鏂囨湰</param>
public void MonMethod(FrameLayout fLayout, Button button)
{
- LogicView.MonView monView = new LogicView.MonView();
- monView.btnTitle.TextID = StringId.monthly;
- monView.FLayoutView(fLayout);
- monView.btnCancel.MouseUpEventHandler += (sender2, e2) =>
- {
- monView.frameLayout.RemoveFromParent();
- };
- //瀹氫箟涓�涓眬閮╩onList鍒楄〃鐢ㄦ潵璁板綍閫変腑鏁版嵁;
- List<string> monList = new List<string>();
- if (Logic.currlogic.cycle.type == "mon")
- {
- //鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
- monList.AddRange(Logic.currlogic.cycle.value);
- }
- //瀹氫箟涓�涓彉閲忚褰曡鏁�
- int lineSun = 0;
- for (int i = 1; i < 32; i++)
- {
- Button monTextBtn = new Button
- {
- Width = Application.GetRealWidth(30),
- Height = Application.GetRealWidth(30),
- Radius = (uint)Application.GetRealWidth(15),
- Text = i.ToString(),
- TextSize = LogicView.TextSize.text14,
- TextColor = CSS.CSS_Color.textColor,
- SelectedTextColor = CSS.CSS_Color.view,
- SelectedBackgroundColor = CSS.CSS_Color.textConfirmColor,
- BackgroundColor = CSS.CSS_Color.viewTranslucence,
- Tag = i,
- };
- monView.frameLayout.AddChidren(monTextBtn);
- if (lineSun > 0)
- {
- monTextBtn.X = Application.GetRealWidth(16 + ((i - 1) - lineSun * 7) * 46);
- }
- else
- {
- monTextBtn.X = Application.GetRealWidth(16 + (i - 1) * 46);
- }
- monTextBtn.Y = Application.GetRealWidth(58 + 10 + lineSun * (30 + 10));
+ PublicInterface weekView = new PublicInterface();
+ weekView.MonSelectShow(fLayout, Logic.currlogic, (monList) =>
+ {
+ Logic.currlogic.cycle.type = "mon";
+ Logic.currlogic.cycle.value = monList;
+ button.Text = MainView.GetMonString(monList);
+ });
- if (i % 7 == 0)
- {
- //涓�瀹氭墽琛屽畬鍐嶅垽鏂槸鍚﹁鎹㈣.
- lineSun = lineSun + 1;
-
- }
- monTextBtn.MouseUpEventHandler += (sender, e) =>
- {
- string clickIndex = monTextBtn.Tag.ToString();
- monTextBtn.IsSelected = !monTextBtn.IsSelected;
- if (monTextBtn.IsSelected)
- {
- monTextBtn.IsSelected = true;
- if (!monList.Contains(clickIndex))
- {
- //娣诲姞閫変腑鏁版嵁
- monList.Add(clickIndex);
- }
- }
- else
- {
- monTextBtn.IsSelected = false;
- if (monList.Contains(clickIndex))
- {
- //绉婚櫎閫変腑鏁版嵁
- monList.Remove(clickIndex);
- }
- }
- };
-
- if (monList.Contains(i.ToString()))
- {
- monTextBtn.IsSelected = true;
- }
- }
- //纭畾鐐瑰嚮浜嬩欢
- monView.btnConfirm.MouseUpEventHandler += (sender1, e1) =>
- {
- if (monList.Count == 0)
- {
- //鎻愮ず锛氳繕娌￠�変腑鎵ц鍛ㄦ湡
- return;
- }
- Logic.currlogic.cycle.type = "mon";
- Logic.currlogic.cycle.value = monList;
- button.Text = MainView.GetMonString(monList);
- fLayout.RemoveFromParent();
- };
}
/// <summary>
/// 婊¤冻鏉′欢
@@ -492,91 +426,29 @@
/// <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();
+ List<string> strList = new List<string> {
+ Language.StringByID(StringId.andCondition),
+ Language.StringByID(StringId.orCondition),
};
+ ///涔嬪墠鐨勭姸鎬佹枃鏈�
+ string currCondition = button.Text;
- //瀹氫箟涓�涓眬閮ㄥ彉閲忚褰曢�変腑鏂囨湰鐘舵��
- 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.GetRealWidth(28);
- andConditionViews.btnNextIcon.Height = Application.GetRealWidth(28);
- andConditionViews.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
- andConditionViews.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
- meetTheConditionView.frameLayout.AddChidren(andConditionViews.FLayoutView());
+ PublicInterface conditionView = new PublicInterface();
+ conditionView.SingleSelectionShow(fLayout, strList, Language.StringByID(StringId.meetTheCondition), currCondition
+ , (stateValue) =>
+ {
+ if (stateValue == Language.StringByID(StringId.orCondition))
+ {
+ Logic.currlogic.relation = "or";
+ }
+ else
+ {
+ Logic.currlogic.relation = "and";
+ }
+ button.Text = stateValue;
+ });
- 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.GetRealWidth(28);
- orConditionView.btnNextIcon.Height = Application.GetRealWidth(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();
- };
}
/// <summary>
@@ -671,5 +543,22 @@
return stateList;
}
+
+ /// <summary>
+ /// 鐏拌壊寮规鐖舵帶浠�
+ /// </summary>
+ /// <param name="frame">鏄剧ず鍦ㄥ摢涓晫闈�</param>
+ /// <returns></returns>
+ public FrameLayout GetFrame(FrameLayout frame, string tagKey)
+ {
+ FrameLayout fLayout = new FrameLayout
+ {
+ BackgroundColor = CSS.CSS_Color.viewTrans60lucence,
+ Tag = tagKey,
+
+ };
+ frame.AddChidren(fLayout);
+ return fLayout;
+ }
}
}
--
Gitblit v1.8.0