From 6b7a07bcbe147be7ed64994c40bcc5b0a2042aae Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 05 七月 2021 11:23:35 +0800
Subject: [PATCH] 代码合并-温居城
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
index 70ee478..9d4af53 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Time3.cs
@@ -17,12 +17,16 @@
LogicView.TopView topView = new LogicView.TopView();
topView.frameLayout.Height = Application.GetRealHeight(64 + 20);
this.AddChidren(topView.FLayoutView());
+ topView.topNameBtn.Text = titelText;
+ //鑾峰彇瀹藉害
+ int widthValue = topView.topNameBtn.GetTextWidth();
+ int textWidth = (Application.GetRealWidth(255) - widthValue) / 2;
Button locationBtn = new Button
{
Width = Application.GetRealWidth(18),
Height = Application.GetRealWidth(18),
- X = Application.GetRealWidth(208),
- Y = Application.GetRealHeight(34),
+ X = Application.GetRealWidth(60 + 4) + textWidth + widthValue,
+ Y = Application.GetRealHeight(34 + 1),
UnSelectedImagePath = "LogicIcon/location.png",
};
@@ -41,7 +45,6 @@
{
RemoveFromParent();
};
- topView.topNameBtn.Text = titelText;
FrameLayout viewLayout = new FrameLayout
{
@@ -241,13 +244,13 @@
private void AddDic(string keyValue, string value, bool edit, int index)
{
Input inputTime = new Input();
- inputTime.sid = LogicMethod.NewSid();
+ inputTime.sid = LogicMethod.CurrLogicMethod.NewSid();
inputTime.condition_type = "1";
Dictionary<string, string> dic = new Dictionary<string, string>();
- LogicMethod.dictionary(dic, "key", keyValue);
- LogicMethod.dictionary(dic, "comparator", "=");
- LogicMethod.dictionary(dic, "data_type", "string");
- LogicMethod.dictionary(dic, "value", value);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "key", keyValue);
+ LogicMethod.CurrLogicMethod.dictionary(dic, "comparator", "=");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "data_type", "string");
+ LogicMethod.CurrLogicMethod.dictionary(dic, "value", value);
inputTime.condition.Add(dic);
AddCondition(inputTime, edit, index);
}
@@ -269,7 +272,7 @@
//娣诲姞涓�涓柊鐨勬椂闂存潯浠�
Logic.currlogic.input.Add(input);
}
- LogicMethod.RemoveAllView();
+ LogicMethod.CurrLogicMethod.RemoveAllView();
AddLogic addLogic = new AddLogic();
MainPage.BasePageView.AddChidren(addLogic);
addLogic.Show();
--
Gitblit v1.8.0