From 1fa13087ee7be5502e2e42cbd07cf185cbc69a9c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十月 2023 13:57:23 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into wxr-2.2

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs |   52 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
index 0e3bf7b..8b4b089 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
@@ -14,7 +14,7 @@
         {
             this.Width = Application.GetRealWidth(width);
             this.Height = Application.GetRealWidth(height);
-            this.Radius = (uint)Application.GetRealHeight(cornerValue);
+            this.Radius = (uint)Application.GetRealWidth(cornerValue);
             this.BackgroundColor = MusicColor.ViewColor;
             this.Gravity = Gravity.CenterHorizontal;
         }
@@ -28,6 +28,13 @@
             SelectedImagePath = "AksIcon/shang_selected.png",
             Name = "涓�",
         };
+
+        Button btnTopClick = new Button
+        {
+            X = Application.GetRealWidth(52),
+            Width = Application.GetRealWidth(76),
+            Height = Application.GetRealHeight(40),
+        };
         Button btnBottom = new Button
         {
             Y = Application.GetRealWidth(144),
@@ -38,6 +45,13 @@
             SelectedImagePath = "AksIcon/xia_selected.png",
             Name = "涓�",
         };
+        Button btnBottomClick = new Button
+        {
+            Y = Application.GetRealWidth(128),
+            X = Application.GetRealWidth(52),
+            Width = Application.GetRealWidth(76),
+            Height = Application.GetRealHeight(52),
+        };
         Button btnLeft = new Button
         {
             Y = Application.GetRealWidth(78),
@@ -47,6 +61,14 @@
             UnSelectedImagePath = "AksIcon/zuo.png",
             SelectedImagePath = "AksIcon/zuo_selected.png",
             Name = "宸�",
+
+        };
+
+        Button btnLeftClick = new Button
+        {
+            Y = Application.GetRealWidth(52),
+            Width = Application.GetRealWidth(52),
+            Height = Application.GetRealHeight(76),
 
         };
         Button btnRight = new Button
@@ -61,12 +83,21 @@
 
         };
 
+        Button btnRightClick = new Button
+        {
+            X = Application.GetRealWidth(128),
+            Y = Application.GetRealWidth(52),
+            Width = Application.GetRealWidth(52),
+            Height = Application.GetRealHeight(76),
+
+        };
+
         Button btnOkbj = new Button
         {
             Gravity=Gravity.Center,
             Width = Application.GetRealWidth(76),
             Height = Application.GetRealWidth(76),
-            Radius = (uint)Application.GetRealHeight(38),
+            Radius = (uint)Application.GetRealWidth(38),
             BackgroundColor = MusicColor.WhiteColor,
 
 
@@ -76,7 +107,7 @@
             Gravity = Gravity.Center,
             Width = Application.GetRealWidth(28),
             Height = Application.GetRealWidth(28),
-            Radius = (uint)Application.GetRealHeight(14),
+            Radius = (uint)Application.GetRealWidth(14),
             BackgroundColor = 0xff1B2D4D,
             SelectedBackgroundColor = MusicColor.SelectedColor,
             Name = "纭畾"
@@ -85,11 +116,17 @@
         public void AddView(FrameLayout layout)
         {
             this.AddChidren(btnTop);
+            this.AddChidren(btnTopClick);
             this.AddChidren(btnBottom);
+            this.AddChidren(btnBottomClick);
             this.AddChidren(btnLeft);
+            this.AddChidren(btnLeftClick);
             this.AddChidren(btnRight);
+            this.AddChidren(btnRightClick);
             this.AddChidren(btnOkbj);
             this.AddChidren(btnOk);
+
+
             layout.AddChidren(this);
             //btnBottom.Y = btnOkbj.Bottom + Application.GetRealWidth(16);
 
@@ -107,6 +144,7 @@
                 //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
             };
             btnTop.MouseUpEventHandler += UpClick;
+            btnTopClick.MouseUpEventHandler += UpClick;
 
 
             EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -119,6 +157,7 @@
                 action?.Invoke(keypadEntity);
             };
             btnTop.MouseDownEventHandler += DownClick;
+            btnTopClick.MouseDownEventHandler += DownClick;
         }
 
         /// <summary>
@@ -135,6 +174,7 @@
                 //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
             };
             btnBottom.MouseUpEventHandler += UpClick;
+            btnBottomClick.MouseUpEventHandler += UpClick;
 
 
             EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -147,6 +187,7 @@
                 //鎸変笅鍘绘敼鍙樿儗鏅鑹�
             };
             btnBottom.MouseDownEventHandler += DownClick;
+            btnBottomClick.MouseDownEventHandler += DownClick;
         }
         /// <summary>
         /// 宸�
@@ -160,6 +201,7 @@
                 //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
             };
             btnLeft.MouseUpEventHandler += UpClick;
+            btnLeftClick.MouseUpEventHandler += UpClick;
 
 
             EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -172,6 +214,8 @@
                 //鎸変笅鍘绘敼鍙樿儗鏅鑹�
             };
             btnLeft.MouseDownEventHandler += DownClick;
+            btnLeftClick.MouseDownEventHandler += DownClick;
+
         }
         /// <summary>
         /// 鍙�
@@ -185,6 +229,7 @@
                 //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
             };
             btnRight.MouseUpEventHandler += UpClick;
+            btnRightClick.MouseUpEventHandler += UpClick;
 
 
             EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -197,6 +242,7 @@
                 action?.Invoke(keypadEntity);
             };
             btnRight.MouseDownEventHandler += DownClick;
+            btnRightClick.MouseDownEventHandler += DownClick;
         }
 
 

--
Gitblit v1.8.0