From 6ba43603ccd8868a4ee73e9b978b7cb20a5b2c52 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 04 十二月 2020 14:24:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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..15586e8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
@@ -7,12 +7,23 @@
/// <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>
/// 锛堟潯浠舵垨鑰呯洰鏍囷級鍥炬爣
@@ -77,7 +88,16 @@
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,
+ Gravity = Gravity.Center,
+ TextAlignment = TextAlignment.Center,
+ };
+
public Button btnClick = new Button
{
Height = Application.GetRealHeight(44),
@@ -87,20 +107,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