From 44d6b49d86f8c531cbed718a8c109f3bc2db2177 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 八月 2023 16:27:23 +0800
Subject: [PATCH] 2023年08月09日16:27:16

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
index d56a238..e10a4f5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkPage.cs
@@ -37,7 +37,7 @@
             //鍒濆鍖朥I
             this.InitTop();
             this.InitMiddle();
-            //鍒濆鍖栦簨浠�
+            //鍒濆鍖栦簨浠剁洃鍚櫒
             this.EventListener();
             //璇诲彇鏁版嵁
 
@@ -73,12 +73,14 @@
 
             BaseFramLayout typeFLayout = new BaseFramLayout();
             fLayout.AddChidren(typeFLayout);
-            int span= Application.GetRealHeight(20);//闂撮殧
-            int x = Application.GetRealHeight(16);//X杞村亸绉婚噺
-            HorizontalFramLayout horizontalFram = new HorizontalFramLayout();
+            int span= 20;//闂撮殧
+            int x= 16;//X杞村亸绉婚噺
+            int width =375-x;
+            int height = 28;
+            HorizontalFramLayout horizontalFram = new HorizontalFramLayout(width, height);
             typeFLayout.AddChidren(horizontalFram);
-            horizontalFram.Y = Application.GetRealHeight(20);
-            horizontalFram.X = x;
+            horizontalFram.Y = Application.GetRealHeight(span);
+            horizontalFram.X = Application.GetRealHeight(x);
             horizontalFram.SetIndex(2);
             horizontalFram.SetList(horizontalFram.GetTestData);
             horizontalFram.InitControl();
@@ -86,10 +88,10 @@
                 Console.WriteLine("1");
 
             };
-            HorizontalFramLayout horizontalFram1 = new HorizontalFramLayout();
+            HorizontalFramLayout horizontalFram1 = new HorizontalFramLayout(width, height);
             typeFLayout.AddChidren(horizontalFram1);
-            horizontalFram1.Y = horizontalFram.Bottom + span;
-            horizontalFram1.X = x;
+            horizontalFram1.Y = horizontalFram.Bottom + Application.GetRealHeight(span);
+            horizontalFram1.X = Application.GetRealHeight(x);
             horizontalFram1.SetIndex(2);
             horizontalFram1.SetList(horizontalFram1.GetTestData);
             horizontalFram1.InitControl();
@@ -97,20 +99,20 @@
                 Console.WriteLine("2");
 
             };
-            HorizontalFramLayout horizontalFram2 = new HorizontalFramLayout();
+            HorizontalFramLayout horizontalFram2 = new HorizontalFramLayout(width, height);
             typeFLayout.AddChidren(horizontalFram2);
-            horizontalFram2.Y = horizontalFram1.Bottom + span;
-            horizontalFram2.X = x;
+            horizontalFram2.Y = horizontalFram1.Bottom + Application.GetRealHeight(span);
+            horizontalFram2.X = Application.GetRealHeight(x);
             horizontalFram2.SetIndex(2);
             horizontalFram2.SetList(horizontalFram2.GetTestData);
             horizontalFram2.InitControl();
             horizontalFram2.SelectTypeEvent += (index) => {
                 Console.WriteLine("3");
             };
-            HorizontalFramLayout horizontalFram3 = new HorizontalFramLayout();
+            HorizontalFramLayout horizontalFram3 = new HorizontalFramLayout(width, height);
             typeFLayout.AddChidren(horizontalFram3);
-            horizontalFram3.Y = horizontalFram2.Bottom + span;
-            horizontalFram3.X = x;
+            horizontalFram3.Y = horizontalFram2.Bottom + Application.GetRealHeight(span);
+            horizontalFram3.X = Application.GetRealHeight(x);
             horizontalFram3.SetIndex(2);
             horizontalFram3.SetList(horizontalFram3.GetTestData);
             horizontalFram3.InitControl();
@@ -132,14 +134,20 @@
             };
 
 
-            CornerFramLayout imageFLayout = new CornerFramLayout(343, 20 * 168, 3, 0);
+            CornerFramLayout imageFLayout = new CornerFramLayout(343, 20 * 168, 0);
             vv.AddChidren(imageFLayout);
             imageFLayout.X = Application.GetRealWidth(16);
-            imageFLayout.SetList(imageFLayout.GetTestList(20));
-            imageFLayout.LoadImagePage();
+            imageFLayout.LoadImagePage(new List<Entity.KeypadEntity>());
             imageFLayout.selectAction += (index) =>
             {
-                Console.WriteLine("5");
+                CommonMethod.Current.MainThread(() =>
+                {
+                    DetailPage detailPage = new DetailPage();
+                    MainPage.BasePageView.AddChidren(detailPage);
+                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                    detailPage.Show();
+                });
+
             };
             imageFLayout.AdjustRealHeight(16);
         }

--
Gitblit v1.8.0