From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01

---
 HDL_ON/UI/UI2/3-Intelligence/Automation/LogicView/TopView.cs |   57 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 14 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 1672a9f..fe8f4e1 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 fLayout = 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",
@@ -44,10 +44,10 @@
         /// </summary>
         public Button setBtn = new Button
         {
-            Y = Application.GetRealHeight(29),
+            Y = Application.GetRealHeight(28),
             X = Application.GetRealWidth(337),
-            Width = Application.GetMinRealAverage(28),
-            Height = Application.GetMinRealAverage(28),
+            Width = Application.GetRealWidth(32),
+            Height = Application.GetRealWidth(32),
             UnSelectedImagePath = "LogicIcon/set.png",
             Visible = false,
         };
@@ -65,8 +65,8 @@
         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>
         /// 鏈�涓婇潰鐨勯偅鍧楁柟娉�
@@ -74,14 +74,43 @@
         /// <returns></returns>
         public FrameLayout FLayoutView()
         {
-            fLayout.AddChidren(topNameBtn);
-            fLayout.AddChidren(backBtn);
-            fLayout.AddChidren(setBtn);
-            fLayout.AddChidren(clickBackBtn);
-            fLayout.AddChidren(clickSetBtn);
-            return fLayout;
+            frameLayout.AddChidren(topNameBtn);
+            frameLayout.AddChidren(backBtn);
+            frameLayout.AddChidren(setBtn);
+            frameLayout.AddChidren(clickBackBtn);
+            frameLayout.AddChidren(clickSetBtn);
+            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 =  Entity.DB_ResidenceData.Instance.CurrentRegion.homeAddress ,// "骞夸笢骞垮窞甯傜暘绂哄尯鐭虫ゼ闀�",
+            };
+            frameLayout.AddChidren(textBtn);
+        }
     }
 }
 

--
Gitblit v1.8.0