From 852764dc2873798d18bfa3fd5f43895720bd5437 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 20:38:19 +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/AddLogic.cs | 106 ++++-------------------------------------------------
1 files changed, 8 insertions(+), 98 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index f6bb95b..7bebd3c 100755
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -103,7 +103,7 @@
LogicView.LogicTypeTitleView cyclicTitle = new LogicView.LogicTypeTitleView();
cyclicTitle.frameLayout.Height = Application.GetRealHeight(50);
cyclicTitle.frameLayout.Radius = (uint)Application.GetRealHeight(12);
- cyclicTitle.btnText.Text = MainView.GetWeekText(Logic.currlogic);
+ cyclicTitle.btnText.Text = MainView.GetCyclicText(Logic.currlogic);
viewLayout.AddChidren(cyclicTitle.FLayoutView());
#endregion
@@ -160,7 +160,7 @@
this.AddChidren(fLayout);
AndOrMethod(fLayout, titleCondition.btnText);
};
- ///鏉′欢鐐瑰嚮浜嬩欢
+ ///鏉′欢娣诲姞鐐瑰嚮浜嬩欢
addInputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
{
var addInputType = new AddInputType();
@@ -168,7 +168,7 @@
addInputType.Show();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- ///鐩爣鐐瑰嚮浜嬩欢
+ ///鐩爣娣诲姞鐐瑰嚮浜嬩欢
addOutputIcon.btnClick.MouseUpEventHandler += (sen, e) =>
{
var addTarget = new AddTarget();
@@ -209,7 +209,7 @@
{
list.Add(logic.name);
}
- new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
+ new LogicView.TipPopView().InputBox(StringId.editName, InterfaceDsplaysLogic.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
{
Logic.currlogic.name = logicName;
Logic.currlogic.sid = LogicMethod.NewSid();
@@ -477,7 +477,7 @@
weekStateList.Clear();
if (Logic.currlogic.cycle.type == "week")
{
- var list = GetWeekString(Logic.currlogic.cycle.value, "int");
+ var list = InterfaceDsplaysLogic.GetWeekString(Logic.currlogic.cycle.value, "int");
//鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
weekStateList.AddRange(list);
}
@@ -485,7 +485,7 @@
weekView.MultiSelectShow(fLayout, weekStr, Language.StringByID(StringId.cyclic), weekStateList
, (list) =>
{
- var statelist = GetWeekString(list, "str");
+ var statelist = InterfaceDsplaysLogic.GetWeekString(list, "str");
Logic.currlogic.cycle.type = "week";
Logic.currlogic.cycle.value = statelist;
button.Text = MainView.GetWeekString(statelist);
@@ -541,98 +541,8 @@
}
- /// <summary>
- /// 鏄熸湡鍛ㄦ湡杞崲鍊肩殑鏂规硶
- /// </summary>
- /// <param name="list"></param>
- /// <param name="str_or_int"></param>
- /// <returns></returns>
- public List<string> GetWeekString(List<string> list, string str_or_int)
- {
- string weekTextName = "";
- List<string> stateList = new List<string>();
- for (int i = 0; i < list.Count; i++)
- {
- var s = list[i];
- if (str_or_int == "int")
- {
- switch (s)
- {
- case "1":
- {
- weekTextName = Language.StringByID(StringId.monday);
- }
- break;
- case "2":
- {
- weekTextName = Language.StringByID(StringId.tuesday);
- }
- break;
- case "3":
- {
- weekTextName = Language.StringByID(StringId.wednesday);
- }
- break;
- case "4":
- {
- weekTextName = Language.StringByID(StringId.thursday);
- }
- break;
- case "5":
- {
- weekTextName = Language.StringByID(StringId.friday);
- }
- break;
- case "6":
- {
- weekTextName = Language.StringByID(StringId.saturday);
- }
- break;
- case "0":
- {
- weekTextName = Language.StringByID(StringId.sunday);
- }
- break;
- }
-
- }
- else
- {
- if (Language.StringByID(StringId.monday) == s)
- {
- weekTextName = "1";
- }
- else if (Language.StringByID(StringId.tuesday) == s)
- {
- weekTextName = "2";
- }
- else if (Language.StringByID(StringId.wednesday) == s)
- {
- weekTextName = "3";
- }
- else if (Language.StringByID(StringId.thursday) == s)
- {
- weekTextName = "4";
- }
- else if (Language.StringByID(StringId.friday) == s)
- {
- weekTextName = "5";
- }
- else if (Language.StringByID(StringId.saturday) == s)
- {
- weekTextName = "6";
- }
- else if (Language.StringByID(StringId.sunday) == s)
- {
- weekTextName = "0";
- }
- }
- stateList.Add(weekTextName);
-
- }
-
- return stateList;
- }
+
+
}
}
--
Gitblit v1.8.0