From b409ece9569247d7e7b44fc15e8a02556ca05a57 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:27:23 +0800
Subject: [PATCH] 合并温居城代码
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 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..9f8dc40 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
@@ -11,29 +11,40 @@
{
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(343),
- BackgroundColor= CSS.CSS_Color.view,
+ 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
+ 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),
-
+
};
/// <summary>
/// 锛堟潯浠舵垨鑰呯洰鏍囷級鏂囨湰鎻忚堪
/// </summary>
- public Button btnText= new Button
+ public Button btnText = new Button
{
TextSize = TextSize.text14,
Width = Application.GetRealWidth(250),
Height = Application.GetRealHeight(20),
- TextColor= CSS.CSS_Color.textColor,
+ TextColor = CSS.CSS_Color.textColor,
//Y=Application.GetRealHeight(12),
X = Application.GetRealWidth(52),
};
@@ -47,9 +58,9 @@
Width = Application.GetRealWidth(130),
Height = Application.GetRealHeight(17),
TextColor = CSS.CSS_Color.textCancelColor,
- Y=Application.GetRealHeight(14),
+ Y = Application.GetRealHeight(14),
X = Application.GetRealWidth(165),
- TextAlignment=TextAlignment.CenterRight,
+ TextAlignment = TextAlignment.CenterRight,
};
/// <summary>
@@ -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),
@@ -70,14 +81,33 @@
/// </summary>
public Button btnLine = new Button
{
- Width=Application.GetRealWidth(279),
- Y = Application.GetRealHeight(44-1),
+ Width = Application.GetRealWidth(279),
+ Y = Application.GetRealHeight(44 - 1),
X = Application.GetRealWidth(52),
Height = 1,
BackgroundColor = CSS.CSS_Color.viewLine,
};
-
+ /// <summary>
+ /// 寤舵椂
+ /// </summary>
+ public Button btnDelay = new Button
+ {
+ BackgroundColor = CSS.CSS_Color.AuxiliaryColor1,
+ TextID = StringId.delayLogic,
+ TextSize = LogicView.TextSize.text16,
+ TextColor = CSS.CSS_Color.view,
+ };
+ /// <summary>
+ /// 鍒犻櫎
+ /// </summary>
+ 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 +117,25 @@
/// 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(btnDelay);
+ rowLayout.AddRightView(btnDel);
+ rowLayout.AddChidren(btnClick);
btnLine.Y = frameLayout.Height - 1;
frameLayout.AddChidren(btnLine);
- frameLayout.AddChidren(btnClick);
- return frameLayout;
+
}
+
}
}
--
Gitblit v1.8.0