From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
index 9263d75..2a67225 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/SingleLogicView.cs
@@ -10,7 +10,7 @@
public FrameLayout frameLayout = new FrameLayout
{
X = Application.GetRealWidth(16),
- Y = Application.GetRealHeight(12),
+ //Y = Application.GetRealHeight(12),
Width = Application.GetRealWidth(343),
Height = Application.GetRealHeight(102),
BackgroundColor = CSS.CSS_Color.view,
@@ -48,8 +48,8 @@
/// </summary>
public Button btnStateIcon = 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),
@@ -60,8 +60,8 @@
public Button btnLienIcon = new Button
{
- Width = Application.GetMinRealAverage(20),
- Height = Application.GetMinRealAverage(20),
+ Width = Application.GetRealWidth(20),
+ Height = Application.GetRealWidth(20),
Y = Application.GetRealHeight(66),
X = Application.GetRealWidth(48),
@@ -72,13 +72,22 @@
/// </summary>
public Button btnSwitchIcon = new Button
{
- Width = Application.GetMinRealAverage(36),
- Height = Application.GetMinRealAverage(36),
+ Width = Application.GetRealWidth(36),
+ Height = Application.GetRealWidth(36),
Y = Application.GetRealHeight(58),
X = Application.GetRealWidth(295),
UnSelectedImagePath = "LogicIcon/off.png",
+ SelectedImagePath = "LogicIcon/on.png",
- };
+ };
+ /// <summary>
+ /// 鐐瑰嚮浜嬩欢
+ /// </summary>
+ public Button btnclick= new Button
+ {
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(102),
+ };
/// <summary>
/// View鐨勬柟娉�
@@ -90,6 +99,7 @@
frameLayout.AddChidren(btnWeekText);
frameLayout.AddChidren(btnStateIcon);
frameLayout.AddChidren(btnLienIcon);
+ frameLayout.AddChidren(btnclick);
frameLayout.AddChidren(btnSwitchIcon);
return frameLayout;
}
--
Gitblit v1.8.0