From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs | 48 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 35 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
index 8fae4eb..37e2d2d 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
@@ -7,20 +7,31 @@
/// <summary>
/// 涓绘帶浠禫iew
/// </summary>
- public FrameLayout frameLayout = new FrameLayout
+ public FrameLayout frameLayout= new FrameLayout
{
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(343),
BackgroundColor= CSS.CSS_Color.view,
X = Application.GetRealWidth(LogicView.TextSize.left16),
};
+
+ /// <summary>
+ /// 涓绘帶浠禫iew
+ /// </summary>
+ public RowLayout rowLayout = new RowLayout
+ {
+ Height = Application.GetRealHeight(43),
+ Width = Application.GetRealWidth(343),
+ LineColor = CSS.CSS_Color.viewTranslucence,
+ SubViewWidth=Application.GetRealWidth(68),
+ };
/// <summary>
/// 锛堟潯浠舵垨鑰呯洰鏍囷級鍥炬爣
/// </summary>
public Button btnIcon= new Button
{
- Width= Application.GetMinRealAverage(28),
- Height =Application.GetMinRealAverage(28),
+ Width= Application.GetRealWidth(28),
+ Height =Application.GetRealWidth(28),
//Y = Application.GetRealHeight(8),
X = Application.GetRealWidth(TextSize.left12),
@@ -57,8 +68,8 @@
/// </summary>
public Button btnNextIcon = new Button
{
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
+ Width = Application.GetRealWidth(16),
+ Height = Application.GetRealWidth(16),
UnSelectedImagePath = "LogicIcon/next.png",
//Y = Application.GetRealHeight(14),
X = Application.GetRealWidth(315),
@@ -77,7 +88,14 @@
BackgroundColor = CSS.CSS_Color.viewLine,
};
-
+ public Button btnDel = new Button
+ {
+ BackgroundColor = CSS.CSS_Color.textRedColor,
+ TextID = StringId.Del,
+ TextSize = LogicView.TextSize.text16,
+ TextColor = CSS.CSS_Color.view,
+ };
+
public Button btnClick = new Button
{
Height = Application.GetRealHeight(44),
@@ -87,20 +105,24 @@
/// View鐨勬柟娉�
/// </summary>
/// <returns></returns>
- public FrameLayout FLayoutView()
+ public void FLayoutView(VerticalScrolViewLayout verticalScrolView)
{
+ verticalScrolView.AddChidren(frameLayout);
+ frameLayout.AddChidren(rowLayout);
btnIcon.Gravity = Gravity.CenterVertical;
btnText.Gravity = Gravity.CenterVertical;
btnText.TextAlignment = TextAlignment.CenterLeft;
btnNextIcon.Gravity = Gravity.CenterVertical;
- frameLayout.AddChidren(btnIcon);
- frameLayout.AddChidren(btnText);
- frameLayout.AddChidren(btnState);
- frameLayout.AddChidren(btnNextIcon);
+ rowLayout.AddChidren(btnIcon);
+ rowLayout.AddChidren(btnText);
+ rowLayout.AddChidren(btnState);
+ rowLayout.AddChidren(btnNextIcon);
+ rowLayout.AddRightView(btnDel);
+ rowLayout.AddChidren(btnClick);
btnLine.Y = frameLayout.Height - 1;
frameLayout.AddChidren(btnLine);
- frameLayout.AddChidren(btnClick);
- return frameLayout;
+
}
+
}
}
--
Gitblit v1.8.0