From db68ee28e538f1de22db27216f194d131240f901 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 23 十一月 2020 17:46:30 +0800
Subject: [PATCH] 2020-11-23-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs
index 96faae6..1f55cbe 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SelectTypeView.cs
@@ -13,7 +13,7 @@
BackgroundColor = CSS.CSS_Color.view,
};
/// <summary>
- /// 锛堟潯浠舵垨鑰呯洰鏍囷級鍥炬爣
+ /// 鍥炬爣
/// </summary>
public Button btnIcon = new Button
{
@@ -24,7 +24,7 @@
};
/// <summary>
- /// 锛堟潯浠舵垨鑰呯洰鏍囷級鏂囨湰鎻忚堪
+ /// 鏂囨湰鎻忚堪
/// </summary>
public Button btnText = new Button
{
@@ -35,8 +35,39 @@
//Y=Application.GetRealHeight(12),
X = Application.GetRealWidth(52),
};
+
+
/// <summary>
- /// 锛堟潯浠舵垨鑰呯洰鏍囷級鍥炬爣
+ /// 璁惧鍚嶇О
+ /// </summary>
+ public Button btnDeviceName = new Button
+ {
+ Width = Application.GetRealWidth(250),
+ Height = Application.GetRealHeight(20),
+ TextSize = TextSize.text14,
+ TextColor = CSS.CSS_Color.textColor,
+ Y =Application.GetRealHeight(6),
+ X = Application.GetRealWidth(52),
+ TextAlignment = TextAlignment.CenterLeft,
+ Visible =false,
+
+ };
+ /// <summary>
+ /// 鎴块棿鍚�(鍗虫槸=鍖哄煙鍚嶇О)
+ /// </summary>
+ public Button btnRoomName= new Button
+ {
+ Width = Application.GetRealWidth(250),
+ Height = Application.GetRealHeight(14),
+ TextSize = TextSize.text10,
+ TextColor = CSS.CSS_Color.textCancelColor,
+ Y=Application.GetRealHeight(30),
+ X = Application.GetRealWidth(52),
+ TextAlignment = TextAlignment.CenterLeft,
+ Visible = false,
+ };
+ /// <summary>
+ /// 鍥炬爣
/// </summary>
public Button btnNextIcon = new Button
{
@@ -64,7 +95,7 @@
Height = Application.GetRealHeight(50),
};
/// <summary>
- /// 鏉′欢鎴栬�呯洰鏍囦富鎺т欢鐨勬柟娉�
+ /// View鐨勬柟娉�
/// </summary>
/// <returns></returns>
public FrameLayout FLayoutView()
@@ -75,6 +106,8 @@
btnNextIcon.Gravity = Gravity.CenterVertical;
frameLayout.AddChidren(btnIcon);
frameLayout.AddChidren(btnText);
+ frameLayout.AddChidren(btnDeviceName);
+ frameLayout.AddChidren(btnRoomName);
frameLayout.AddChidren(btnNextIcon);
btnLine.Y = frameLayout.Height - 1;
frameLayout.AddChidren(btnLine);
--
Gitblit v1.8.0