From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs |  185 ++++++++++-----------------------------------
 1 files changed, 42 insertions(+), 143 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index 5dcca72..e246608 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -108,8 +108,8 @@
             //寮�鍏�
             switchBtn.MouseUpEventHandler += (senser, e) =>
             {
-                switchBtn.IsSelected = false;
                 KeyControl("on_off", "寮�/鍏�");
+                this.SetButtonIsSelected(switchBtn);
             };
             //淇℃伅
             xinxiFL.SetClickListener(() =>
@@ -239,15 +239,16 @@
             //宸�
             btnLeft.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
+               
                 KeyControl("key_left", "宸�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_left_selected.png", "AksIcon/ykq_ok.png");
 
             };
             //涓�
             btnShang.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
                 KeyControl("key_up", "涓�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_shang_selected.png", "AksIcon/ykq_ok.png");
 
             };
 
@@ -255,48 +256,50 @@
             btnRight.MouseDownEventHandler += (sender, e) =>
             {
 
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
+           
                 KeyControl("key_right", "鍙�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_right_selected.png", "AksIcon/ykq_ok.png");
 
             };
 
             //涓�
             btnXia.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
+               
 
                 KeyControl("key_down", "涓�");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_xia_selected.png", "AksIcon/ykq_ok.png");
             };
             //OK
             btnOk.MouseDownEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
 
                 KeyControl("key_ok", "纭畾");
+                this.SetHighlightImagePath(okFl, "AksIcon/ykq_ok_selected.png", "AksIcon/ykq_ok.png");
             };
             //闊抽噺+
             btnYingliangjia.MouseUpEventHandler += (sen, e) =>
             {
-                btnYingliangjia.IsSelected = false;
                 KeyControl("volume_up", "闊抽噺+");
+                this.SetButtonIsSelected(btnYingliangjia);
             };
             //闊抽噺-
             btnYingliangjian.MouseUpEventHandler += (sen, e) =>
             {
-                btnYingliangjian.IsSelected = false;
                 KeyControl("volume_down", "闊抽噺-");
+                this.SetButtonIsSelected(btnYingliangjian);
             };
             //棰戦亾+
             btnPindaojia.MouseUpEventHandler += (sen, e) =>
             {
-                btnPindaojia.IsSelected = false;
                 KeyControl("ch_up", "棰戦亾+");
+                this.SetButtonIsSelected(btnPindaojia);
             };
             //棰戦亾-
             btnPindaojian.MouseUpEventHandler += (sen, e) =>
             {
-                btnPindaojian.IsSelected = false;
                 KeyControl("ch_down", "棰戦亾-");
+                this.SetButtonIsSelected(btnPindaojian);
             };
 
             //鑿滃崟
@@ -308,7 +311,7 @@
             //杩斿洖
             fanhuiFL.SetClickListener(() =>
             {
-                KeyControl("return", "杩斿洖");
+                KeyControl("cancel", "杩斿洖");
 
             });
             //涓婁竴閮�
@@ -776,15 +779,7 @@
                 SelectedImagePath = "AksIcon/ykq_yingliangjia_selected.png",
             };
             baseFl.AddChidren(btnYingliangjia);
-            btnYingliangjia.MouseDownEventHandler += (sen, e) =>
-            {
-                btnYingliangjia.IsSelected = true;
-            };
-            btnYingliangjia.MouseUpOutsideEventHandler += (sen, e) =>
-            {
-
-                btnYingliangjia.IsSelected = false;
-            };
+           
 
 
             btnYingliangjian = new Button
@@ -797,17 +792,7 @@
                 SelectedImagePath = "AksIcon/ykq_yingliangjian_selected.png",
             };
             baseFl.AddChidren(btnYingliangjian);
-            btnYingliangjian.MouseDownEventHandler += (sen, e) =>
-            {
-
-                btnYingliangjian.IsSelected = true;
-            };
-            btnYingliangjian.MouseUpOutsideEventHandler += (sen, e) =>
-            {
-
-                btnYingliangjian.IsSelected = false;
-            };
-
+            
 
 
             btnPindaojia = new Button
@@ -820,16 +805,7 @@
                 SelectedImagePath = "AksIcon/ykq_pindaojia_selected.png",
             };
             baseFl.AddChidren(btnPindaojia);
-            btnPindaojia.MouseDownEventHandler += (sen, e) =>
-            {
-
-                btnPindaojia.IsSelected = true;
-            };
-            btnPindaojia.MouseUpOutsideEventHandler += (sen, e) =>
-            {
-
-                btnPindaojia.IsSelected = false;
-            };
+           
 
 
             btnPindaojian = new Button
@@ -842,17 +818,7 @@
                 SelectedImagePath = "AksIcon/ykq_pindaojian_selected.png",
             };
             baseFl.AddChidren(btnPindaojian);
-            btnPindaojian.MouseDownEventHandler += (sen, e) =>
-            {
-
-                btnPindaojian.IsSelected = true;
-            };
-
-            btnPindaojian.MouseUpOutsideEventHandler += (sen, e) =>
-            {
-
-                btnPindaojian.IsSelected = false;
-            };
+           
 
 
 
@@ -914,67 +880,6 @@
                 Gravity = Gravity.Center,
             };
             okFl.AddChidren(btnOk);
-
-
-
-
-
-            btnLeft.MouseUpOutsideEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-            btnLeft.MouseDownEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
-
-            };
-            btnShang.MouseDownEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_shang_selected.png";
-
-
-            };
-            btnShang.MouseUpOutsideEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-            btnRight.MouseDownEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
-
-            };
-            btnRight.MouseUpOutsideEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-
-            btnXia.MouseDownEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";
-
-            };
-
-            btnXia.MouseUpOutsideEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-            btnOk.MouseDownEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
-
-            };
-            btnOk.MouseUpOutsideEventHandler += (sender, e) =>
-            {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
-
-            };
-
-
-
 
             #endregion
 
@@ -1174,13 +1079,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
@@ -1227,7 +1130,7 @@
     /// <summary>
     /// 鑷繁寮勪竴涓狥rameLayout
     /// </summary>
-    class CustomFrameLayout : FrameLayout
+    class CustomFrameLayout : BaseFramLayout
     {
         public const int widthFrameLayout = 36;
         public const int heightFrameLayout = 49 - 6;
@@ -1332,35 +1235,31 @@
         /// <param name="action">鍥炶皟(鐖剁被瀵硅薄)</param>
         public void SetClickListener(Action action)
         {
-            clickFl.MouseDownEventHandler += (sender, e) =>
+            clickFl.MouseUpEventHandler += (sender, e) =>
             {
-                //this.BackgroundColor = 0xff798394;
+                action?.Invoke();
+                //鎸変笅鍘绘敼鍙樿儗鏅鑹�
                 btnImage.IsSelected = true;
                 btnText.IsSelected = true;
                 btnNumber.IsSelected = true;
                 btn.IsSelected = true;
-
-
+                new System.Threading.Thread(() =>
+                {
+                    System.Threading.Thread.Sleep(millisecondsTimeout);
+                    Application.RunOnMainThread(() =>
+                    {
+                        //寮硅捣鏉ヨ繕鍘熻儗鏅鑹�
+                        btnImage.IsSelected = false;
+                        btnText.IsSelected = false;
+                        btnNumber.IsSelected = false;
+                        btn.IsSelected = false;
+                    });
+                })
+                { IsBackground = true }.Start();
+              
             };
 
-            clickFl.MouseUpEventHandler += (sender, e) =>
-            {
-                //this.BackgroundColor = 0x00000000;
-                btnImage.IsSelected = false;
-                btnText.IsSelected = false;
-                btnNumber.IsSelected = false;
-                btn.IsSelected = false;
-                action?.Invoke();
-            };
-
-            clickFl.MouseUpOutsideEventHandler += (sender, e) =>
-            {
-                //this.BackgroundColor = 0x00000000;
-                btnImage.IsSelected = false;
-                btnText.IsSelected = false;
-                btnNumber.IsSelected = false;
-                btn.IsSelected = false;
-            };
+            
 
         }
 

--
Gitblit v1.8.0