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/TopView.cs |   45 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
index 28aac76..4a2d600 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs
@@ -9,7 +9,7 @@
         /// <summary>
         /// 鏈�涓婇潰鍧梀iew
         /// </summary>
-        public FrameLayout frameLayout = new FrameLayout 
+        public FrameLayout frameLayout = new FrameLayout
         {
             BackgroundColor = CSS.CSS_Color.viewTop,
             Height = Application.GetRealHeight(64),
@@ -22,7 +22,7 @@
         {
             TextSize = TextSize.text18,
             TextColor = CSS.CSS_Color.textColor,
-            Width = Application.GetRealWidth(TextSize.view375-60-60),
+            Width = Application.GetRealWidth(TextSize.view375 - 60 - 60),
             Height = Application.GetRealHeight(25),
             Y = Application.GetRealHeight(30),
             X = Application.GetRealWidth(60)
@@ -33,7 +33,7 @@
         public Button backBtn = new Button
         {
             Width = Application.GetRealWidth(12),
-            Height = Application.GetRealHeight(20),
+            Height = Application.GetRealWidth(20),
             X = Application.GetRealWidth(TextSize.left16),
             Y = Application.GetRealHeight(32),
             UnSelectedImagePath = "LogicIcon/back.png",
@@ -46,8 +46,8 @@
         {
             Y = Application.GetRealHeight(28),
             X = Application.GetRealWidth(337),
-            Width = Application.GetMinRealAverage(32),
-            Height = Application.GetMinRealAverage(32),
+            Width = Application.GetRealWidth(32),
+            Height = Application.GetRealWidth(32),
             UnSelectedImagePath = "LogicIcon/set.png",
             Visible = false,
         };
@@ -62,11 +62,11 @@
         /// <summary>
         /// 璁剧疆鍥炬爣澧炲姞鐑敭澶у皬
         /// </summary>
-        public Button clickSetBtn = new Button 
+        public Button clickSetBtn = new Button
         {
             X = Application.GetRealWidth(337 - 37),
-            Width = Application.GetMinRealAverage(28 + 37),
-            Height = Application.GetMinRealAverage(28 + 7 + 29),
+            Width = Application.GetRealWidth(28 + 37),
+            Height = Application.GetRealWidth(28 + 7 + 29),
         };
         /// <summary>
         /// 鏈�涓婇潰鐨勯偅鍧楁柟娉�
@@ -82,6 +82,35 @@
             return frameLayout;
         }
         #endregion
+
+        /// <summary>
+        /// 鏄剧ず浣嶇疆
+        /// </summary>
+        public void Location()
+        {
+            //鑾峰彇瀹藉害
+            int widthValue = topNameBtn.GetTextWidth();
+            int textWidth = (Application.GetRealWidth(255) - widthValue) / 2;
+            Button locationBtn = new Button
+            {
+                Width = Application.GetRealWidth(18),
+                Height = Application.GetRealWidth(18),
+                X = Application.GetRealWidth(60 + 4) + textWidth + widthValue,
+                Y = Application.GetRealHeight(34 + 1),
+                UnSelectedImagePath = "LogicIcon/location.png",
+            };
+            frameLayout.AddChidren(locationBtn);
+
+            Button textBtn = new Button
+            {
+                Height = Application.GetRealHeight(14),
+                Y = Application.GetRealHeight(57),
+                TextSize = LogicView.TextSize.text10,
+                TextColor = CSS.CSS_Color.textCancelColor,
+                //Text = "骞夸笢骞垮窞甯傜暘绂哄尯鐭虫ゼ闀�",
+            };
+            frameLayout.AddChidren(textBtn);
+        }
     }
 }
 

--
Gitblit v1.8.0