From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 5f5c102..3560fd2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -116,8 +116,8 @@
//push.frameLayout.Height = Application.GetRealHeight(50);
//push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
//push.btnText.TextID = StringId.push;
- //push.btnNextIcon.Width = Application.GetMinRealAverage(36);
- //push.btnNextIcon.Height = Application.GetMinRealAverage(36);
+ //push.btnNextIcon.Width = Application.GetRealWidth(36);
+ //push.btnNextIcon.Height = Application.GetRealWidth(36);
//push.btnNextIcon.X = Application.GetRealWidth(305);
//push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
//push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
@@ -128,7 +128,7 @@
//notification.btnText.TextID = StringId.notification;
//viewLayout.AddChidren(notification.FLayoutView());
/////涓婁笅闂撮殧62鍍忕礌
- //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
+ //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(40) });
#endregion
#region 淇濆瓨
@@ -204,7 +204,8 @@
{
list.Add(logic.name);
}
- new LogicView.TipPopView().InputBox(StringId.editName, InterfaceDsplaysLogic.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
+ new LogicView.TipPopView().InputBox(StringId.editName, InpOrOutLogicMethod.GetLogicName(Logic.currlogic), StringId.nameNull, StringId.NameAlreadyExists, list, (logicName,view
+ ) =>
{
Logic.currlogic.name = logicName;
Logic.currlogic.sid = LogicMethod.NewSid();
@@ -267,7 +268,7 @@
})
{ IsBackground = true }.Start();
- });
+ },()=> { });
}
else
@@ -457,33 +458,30 @@
/// <param name="button">鏄剧ず鏂囨湰</param>
public void WeekMethod(FrameLayout fLayout, Button button)
{
- List<string> weekStr = new List<string> {
- Language.StringByID(StringId.monday),
- Language.StringByID(StringId.tuesday),
- Language.StringByID(StringId.wednesday),
- Language.StringByID(StringId.thursday),
- Language.StringByID(StringId.friday),
- Language.StringByID(StringId.saturday),
- Language.StringByID(StringId.sunday),
- };
-
//瀹氫箟涓�涓眬閮╳eekList鍒楄〃鐢ㄦ潵璁板綍閫変腑鏁版嵁;
List<string> weekStateList = new List<string>();
- weekStateList.Clear();
+
+ PublicInterface weekView = new PublicInterface();
if (Logic.currlogic.cycle.type == "week")
{
- var list = InterfaceDsplaysLogic.GetWeekString(Logic.currlogic.cycle.value, "int");
+ //鏁版嵁杞崲
+ var list = weekView.GetWeekString(Logic.currlogic.cycle.value, "int");
//鍔犺浇涔嬪墠淇濆瓨鐨勬暟鎹�
weekStateList.AddRange(list);
}
- PublicInterface weekView = new PublicInterface();
- weekView.MultiSelectShow(fLayout, weekStr, Language.StringByID(StringId.cyclic), weekStateList
+ var weekListStr= weekView.GetViewList("week");
+ weekView.MultiSelectShow(fLayout, weekListStr, Language.StringByID(StringId.cyclic), weekStateList
, (list) =>
{
- var statelist = InterfaceDsplaysLogic.GetWeekString(list, "str");
+
+ //閫変腑鏁版嵁澶勭悊
+ var statelist = weekView.GetWeekString(list, "str");
+ string textStr = MainView.GetWeekString(statelist);
+ //鏄剧ず閫変腑鏁版嵁
+ button.Text = textStr;
+ //灏佽鏁版嵁
Logic.currlogic.cycle.type = "week";
Logic.currlogic.cycle.value = statelist;
- button.Text = MainView.GetWeekString(statelist);
});
}
@@ -498,9 +496,13 @@
PublicInterface weekView = new PublicInterface();
weekView.MonSelectShow(fLayout, Logic.currlogic, (monList) =>
{
+ //閫変腑鏁版嵁澶勭悊
+ string textStr= MainView.GetMonString(monList);
+ //鏄剧ず閫変腑鏁版嵁
+ button.Text = textStr;
+ //灏佽鏁版嵁
Logic.currlogic.cycle.type = "mon";
Logic.currlogic.cycle.value = monList;
- button.Text = MainView.GetMonString(monList);
});
}
@@ -510,19 +512,17 @@
/// <param name="button">鏄剧ず鏂囨湰</param>
public void AndOrMethod(Button button)
{
- List<string> strList = new List<string> {
- Language.StringByID(StringId.andCondition),
- Language.StringByID(StringId.orCondition),
- };
+
///涔嬪墠鐨勭姸鎬佹枃鏈�
string currCondition = button.Text;
-
PublicInterface conditionView = new PublicInterface();
+ var strList = conditionView.GetViewList("andor");
conditionView.SingleSelectionShow(this, strList, Language.StringByID(StringId.meetTheCondition), currCondition
, (stateValue) =>
{
//鐣岄潰鏄剧ず閫変腑鍊�
button.Text = stateValue;
+ //灏佽鏁版嵁
if (stateValue == Language.StringByID(StringId.orCondition))
{
Logic.currlogic.relation = "or";
--
Gitblit v1.8.0