From 9f47eb8beda408a0bcf616dcd0dddc0067782974 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 10 十二月 2020 17:53:01 +0800
Subject: [PATCH] 2020-12-10-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index d9ebfb3..6e2bd4f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -23,7 +23,7 @@
{
RemoveFromParent();
};
- if (string.IsNullOrEmpty(Logic.currlogic.sid))
+ if (string.IsNullOrEmpty(Logic.currlogic.userLogicId))
{
topView.topNameBtn.TextID = StringId.newAutomation;
topView.setBtn.Visible = false;
@@ -140,8 +140,8 @@
#endregion
#region 鎵ц鎺ㄩ�� 鍙戦�侀�氱煡
- /////涓婁笅闂撮殧12鍍忕礌
- //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
+ ///涓婁笅闂撮殧12鍍忕礌
+ viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
/////鎵ц鎺ㄩ�乮ew
//LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView();
//push.frameLayout.Height = Application.GetRealHeight(50);
@@ -169,7 +169,7 @@
this.AddChidren(saveView.FLayoutView());
saveView.btnClick.MouseUpEventHandler += (sender, e) =>
{
- if (string.IsNullOrEmpty(Logic.currlogic.sid))
+ if (string.IsNullOrEmpty(Logic.currlogic.userLogicId))
{
List<string> list = new List<string>();
foreach (var logic in Logic.LogicList)
@@ -383,8 +383,8 @@
weekTypeView.btnLine.X = Application.GetRealWidth(20);
weekTypeView.btnLine.Width = Application.GetRealWidth(303);
weekTypeView.btnNextIcon.X = Application.GetRealWidth(303);
- weekTypeView.btnNextIcon.Width = Application.GetMinRealAverage(28);
- weekTypeView.btnNextIcon.Height = Application.GetMinRealAverage(28);
+ weekTypeView.btnNextIcon.Width = Application.GetRealWidth(28);
+ weekTypeView.btnNextIcon.Height = Application.GetRealWidth(28);
weekTypeView.btnNextIcon.UnSelectedImagePath = "LogicIcon/weekoff.png";
weekTypeView.btnNextIcon.SelectedImagePath = "LogicIcon/weekon.png";
weekView.frameLayout.AddChidren(weekTypeView.FLayoutView());
@@ -600,8 +600,8 @@
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.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());
@@ -616,8 +616,8 @@
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.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());
--
Gitblit v1.8.0