From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 8640e96..2e1e555 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -140,26 +140,26 @@
#endregion
#region 鎵ц鎺ㄩ�� 鍙戦�侀�氱煡
- ///涓婁笅闂撮殧12鍍忕礌
- viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
- ///鎵ц鎺ㄩ�乮ew
- LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView();
- push.frameLayout.Height = Application.GetRealHeight(50);
- push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
- push.btnText.TextID = StringId.push;
- push.btnNextIcon.Width = Application.GetMinRealAverage(36);
- push.btnNextIcon.Height = Application.GetMinRealAverage(36);
- push.btnNextIcon.X = Application.GetRealWidth(305);
- push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
- push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
- viewLayout.AddChidren(push.FLayoutView());
- ///鍙戦�侀�氱煡View
- LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
- notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
- notification.btnText.TextID = StringId.notification;
- viewLayout.AddChidren(notification.FLayoutView());
- ///涓婁笅闂撮殧62鍍忕礌
- viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
+ /////涓婁笅闂撮殧12鍍忕礌
+ //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(12) });
+ /////鎵ц鎺ㄩ�乮ew
+ //LogicView.LogicTypeTitleView push = new LogicView.LogicTypeTitleView();
+ //push.frameLayout.Height = Application.GetRealHeight(50);
+ //push.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
+ //push.btnText.TextID = StringId.push;
+ //push.btnNextIcon.Width = Application.GetMinRealAverage(36);
+ //push.btnNextIcon.Height = Application.GetMinRealAverage(36);
+ //push.btnNextIcon.X = Application.GetRealWidth(305);
+ //push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
+ //push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
+ //viewLayout.AddChidren(push.FLayoutView());
+ /////鍙戦�侀�氱煡View
+ //LogicView.LogicTypeTitleView notification = new LogicView.LogicTypeTitleView();
+ //notification.frameLayout.SetCornerWithSameRadius(Application.GetRealHeight(12), HDLUtils.RectCornerBottomLeft | HDLUtils.RectCornerBottomRight);
+ //notification.btnText.TextID = StringId.notification;
+ //viewLayout.AddChidren(notification.FLayoutView());
+ /////涓婁笅闂撮殧62鍍忕礌
+ //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
#endregion
#region 淇濆瓨
@@ -245,6 +245,7 @@
dateTypeView.btnLine.Width = Application.GetRealWidth(303);
dateView.frameLayout.AddChidren(dateTypeView.FLayoutView());
dateTypeView.btnClick.Tag = i;//鏍囪绫诲瀷
+
switch (i)
{
case 0:
@@ -506,9 +507,9 @@
{
Button monTextBtn = new Button
{
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- Radius = (uint)Application.GetRealHeight(15),
+ Width = Application.GetRealWidth(30),
+ Height = Application.GetRealWidth(30),
+ Radius = (uint)Application.GetRealWidth(15),
Text = i.ToString(),
TextSize = LogicView.TextSize.text14,
TextColor = CSS.CSS_Color.textColor,
--
Gitblit v1.8.0