From f25c6122eb7e26be5e7f036cf29b9019c4953be2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 21 十二月 2020 19:44:02 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
index 101d71f..b5ba7b4 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/MainView.cs
@@ -34,8 +34,8 @@
};
//鑾峰彇鑷姩鍖栧垪琛�
GetLogicList();
- // for (int i = Logic.LogicList.Count-1; i >= 0; i--)闄嶅簭鎺掑垪
- for (int i = 0; i < Logic.LogicList.Count; i++)
+ for (int i = Logic.LogicList.Count-1; i >= 0; i--)//闄嶅簭鎺掑垪
+ //for (int i = 0; i < Logic.LogicList.Count; i++)
{
var currLogic = Logic.LogicList[i];
///涓婁笅闂撮殧12鍍忕礌
@@ -81,8 +81,8 @@
{ IsBackground = true }.Start();
};
GetSelectIcon(logicView.frameLayout, currLogic);
- //if (i==0)闄嶅簭鎺掑垪
- if (Logic.LogicList.Count - 1 == i)
+ if (i==0)//闄嶅簭鎺掑垪
+ //if (Logic.LogicList.Count - 1 == i)
{
///鏈�鍚庝竴涓窛绂绘渶搴曢儴12,鐣岄潰鏄剧ず鏁堟灉浣滅敤;
vv.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
@@ -110,12 +110,12 @@
automationPage.AddChidren(btnTipNot);
Button btnTipNotText = new Button()
{
- Y = btnTipNot.Bottom,
- Height = Application.GetRealWidth(100),
- TextID = StringId.ContentIsEmpty,
+ Y = btnTipNot.Bottom + Application.GetRealHeight(16),
+ Height = Application.GetRealHeight(20),
+ TextID = StringId.logicnull,
TextAlignment = TextAlignment.Center,
- TextColor = CSS.CSS_Color.TextualColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_FirstLevel,
+ TextSize = LogicView.TextSize.text14,
+ TextColor = CSS.CSS_Color.textConfirmColor,
};
automationPage.AddChidren(btnTipNotText);
}
@@ -231,9 +231,8 @@
/// <summary>
/// 鑾峰彇閫昏緫鍒楄〃
/// </summary>
- private static void GetLogicList()
+ public static void GetLogicList()
{
-
if (Logic.LogicList.Count != 0)
{
//鑷姩鍖栧垪琛ㄤ负0鎵嶅幓鑾峰彇鑷姩鍖栧垪琛紱
--
Gitblit v1.8.0