From 311aa775e05f567795e9cc131c67310b3bb133aa Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 26 三月 2021 10:49:09 +0800
Subject: [PATCH] Merge branch 'WJC' into temp-wxr

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
index 3572fd7..3560fd2 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/AddLogic.cs
@@ -116,8 +116,8 @@
             //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.Width = Application.GetRealWidth(36);
+            //push.btnNextIcon.Height = Application.GetRealWidth(36);
             //push.btnNextIcon.X = Application.GetRealWidth(305);
             //push.btnNextIcon.UnSelectedImagePath = "LogicIcon/off.png";
             //push.btnNextIcon.SelectedImagePath = "LogicIcon/on.png";
@@ -128,7 +128,7 @@
             //notification.btnText.TextID = StringId.notification;
             //viewLayout.AddChidren(notification.FLayoutView());
             /////涓婁笅闂撮殧62鍍忕礌
-            //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(62) });
+            //viewLayout.AddChidren(new FrameLayout { Height = Application.GetRealHeight(40) });
             #endregion
 
             #region  淇濆瓨

--
Gitblit v1.8.0