From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 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 b381595..8fae4eb 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/AddOutputInputView.cs
@@ -37,6 +37,21 @@
//Y=Application.GetRealHeight(12),
X = Application.GetRealWidth(52),
};
+
+ /// <summary>
+ /// 锛堟潯浠舵垨鑰呯洰鏍囷級璁惧鐘舵�佹枃鏈弿杩�
+ /// </summary>
+ public Button btnState = new Button
+ {
+ TextSize = TextSize.text12,
+ Width = Application.GetRealWidth(130),
+ Height = Application.GetRealHeight(17),
+ TextColor = CSS.CSS_Color.textCancelColor,
+ Y=Application.GetRealHeight(14),
+ X = Application.GetRealWidth(165),
+ TextAlignment=TextAlignment.CenterRight,
+ };
+
/// <summary>
/// 锛堟潯浠舵垨鑰呯洰鏍囷級鍥炬爣
/// </summary>
@@ -69,7 +84,7 @@
Width = Application.GetRealWidth(343),
};
/// <summary>
- /// 鏉′欢鎴栬�呯洰鏍囦富鎺т欢鐨勬柟娉�
+ /// View鐨勬柟娉�
/// </summary>
/// <returns></returns>
public FrameLayout FLayoutView()
@@ -80,6 +95,7 @@
btnNextIcon.Gravity = Gravity.CenterVertical;
frameLayout.AddChidren(btnIcon);
frameLayout.AddChidren(btnText);
+ frameLayout.AddChidren(btnState);
frameLayout.AddChidren(btnNextIcon);
btnLine.Y = frameLayout.Height - 1;
frameLayout.AddChidren(btnLine);
--
Gitblit v1.8.0