From 5bd5cdbae1d22b5e14e6933b807ed97b89807b6f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 18 十月 2023 19:33:20 +0800
Subject: [PATCH] 2023年10月18日19:32:41

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 5dcca72..9baec70 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -308,7 +308,7 @@
             //杩斿洖
             fanhuiFL.SetClickListener(() =>
             {
-                KeyControl("return", "杩斿洖");
+                KeyControl("cancel", "杩斿洖");
 
             });
             //涓婁竴閮�
@@ -1174,13 +1174,11 @@
                 tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                 tyySingleFramLayout.btnLeftImage.Visible = false;
 
-                if (tyySingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48))
-                {
-                    tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101 - 48) + tyySingleFramLayout.btnName.GetTextWidth();
-                    tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226 + 48) - tyySingleFramLayout.btnName.GetTextWidth();
-                    tyySingleFramLayout.btnName.Width = tyySingleFramLayout.btnName.GetTextWidth();
-                    tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                }
+                tyySingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+                  tyySingleFramLayout.singleFramLayout,
+                  tyySingleFramLayout.btnName,
+                   tyySingleFramLayout.btnRightImage,
+                   48, 200);
 
             }
             else

--
Gitblit v1.8.0