From f222fb8ae7d265f094922f31970e1e805672ee01 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 17 十月 2023 16:53:55 +0800
Subject: [PATCH] 2023年10月17日16:53:42

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

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
index d0c9130..5dcca72 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -35,7 +35,7 @@
         /// <summary>
         /// 鍒囨崲璁惧瀹瑰櫒
         /// </summary>
-        TypeMultiFramLayout typeMultiFramLayout; 
+        TypeMultiFramLayout typeMultiFramLayout;
         TypeSingleFramLayout tyySingleFramLayout;
 
         Button switchBtn;
@@ -106,9 +106,9 @@
         private void EventListener()
         {
             //寮�鍏�
-            switchBtn.MouseDownEventHandler += (senser, e) =>
+            switchBtn.MouseUpEventHandler += (senser, e) =>
             {
-                switchBtn.IsSelected = true;
+                switchBtn.IsSelected = false;
                 KeyControl("on_off", "寮�/鍏�");
             };
             //淇℃伅
@@ -154,7 +154,7 @@
             //1
             number1FL.SetClickListener(() =>
             {
-                 KeyControl("number_1", "1");
+                KeyControl("number_1", "1");
             });
             //2
             number2FL.SetClickListener(() =>
@@ -237,16 +237,16 @@
 
             });
             //宸�
-            btnLeft.MouseDownEventHandler += (sender, e) =>
+            btnLeft.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
+                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
                 KeyControl("key_left", "宸�");
 
             };
             //涓�
-            btnShang.MouseDownEventHandler += (sender, e) => 
+            btnShang.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_shang_selected.png";
+                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
                 KeyControl("key_up", "涓�");
 
             };
@@ -254,41 +254,48 @@
             //鍙�
             btnRight.MouseDownEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
+
+                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
                 KeyControl("key_right", "鍙�");
 
             };
 
             //涓�
-            btnXia.MouseDownEventHandler += (sender, e) =>
+            btnXia.MouseUpEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";
+                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
+
                 KeyControl("key_down", "涓�");
             };
             //OK
             btnOk.MouseDownEventHandler += (sender, e) =>
             {
-                okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
+                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
+
                 KeyControl("key_ok", "纭畾");
             };
             //闊抽噺+
-            btnYingliangjia.MouseDownEventHandler += (sen, e) => {
-                btnYingliangjia.IsSelected = true;
+            btnYingliangjia.MouseUpEventHandler += (sen, e) =>
+            {
+                btnYingliangjia.IsSelected = false;
                 KeyControl("volume_up", "闊抽噺+");
             };
             //闊抽噺-
-            btnYingliangjian.MouseDownEventHandler += (sen, e) => {
-                btnYingliangjian.IsSelected = true;
+            btnYingliangjian.MouseUpEventHandler += (sen, e) =>
+            {
+                btnYingliangjian.IsSelected = false;
                 KeyControl("volume_down", "闊抽噺-");
             };
             //棰戦亾+
-            btnPindaojia.MouseDownEventHandler += (sen, e) => {
-                btnPindaojia.IsSelected = true;
+            btnPindaojia.MouseUpEventHandler += (sen, e) =>
+            {
+                btnPindaojia.IsSelected = false;
                 KeyControl("ch_up", "棰戦亾+");
             };
             //棰戦亾-
-            btnPindaojian.MouseDownEventHandler += (sen, e) => {
-                btnPindaojian.IsSelected = true;
+            btnPindaojian.MouseUpEventHandler += (sen, e) =>
+            {
+                btnPindaojian.IsSelected = false;
                 KeyControl("ch_down", "棰戦亾-");
             };
 
@@ -372,8 +379,10 @@
                     action?.Invoke(IntType.Control);
                 });
             }
-            if (tyySingleFramLayout!=null) {
-                tyySingleFramLayout.SetClickListener((f) => {
+            if (tyySingleFramLayout != null)
+            {
+                tyySingleFramLayout.SetClickListener((f) =>
+                {
                     action?.Invoke(IntType.Control);
                 });
             }
@@ -394,7 +403,7 @@
                 TextAlignment = TextAlignment.CenterLeft,
                 TextColor = MusicColor.TextColor,
                 TextSize = TextSize.Text16,
-                Text= this.remoteControl.name,
+                Text = this.remoteControl.name,
                 IsBold = true,
             };
             this.AddChidren(btnTitle);
@@ -404,7 +413,7 @@
             {
                 Y = btnTitle.Bottom + Application.GetRealHeight(16),
                 Width = Application.GetRealWidth(240),
-                Height = Application.GetRealHeight(1095-122),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+                Height = Application.GetRealHeight(1095 - 122 - 60),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
                 Radius = (uint)Application.GetRealHeight(17),
                 BackgroundColor = 0xff798394,
                 Gravity = Gravity.CenterHorizontal,
@@ -417,7 +426,7 @@
                 Y = btnTitle.Bottom + Application.GetRealHeight(16),
                 //X = Application.GetRealWidth(71),
                 Width = Application.GetRealWidth(232),
-                Height = Application.GetRealHeight(1095-122),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
+                Height = Application.GetRealHeight(1095 - 122 - 60),//閬ユ帶鍣ㄥ浐瀹氶珮搴�
                 Radius = (uint)Application.GetRealHeight(17),
                 BackgroundColor = 0xff19181E,
                 Gravity = Gravity.CenterHorizontal,
@@ -440,19 +449,23 @@
 
             switchBtn = new Button
             {
-                Height = Application.GetRealWidth(32),
-                Width = Application.GetRealWidth(32),
+                Height = Application.GetRealWidth(48),
+                Width = Application.GetRealWidth(48),
                 Gravity = Gravity.Center,
                 UnSelectedImagePath = "AksIcon/ykq_kai.png",
-                SelectedImagePath= "AksIcon/ykq_kaiguang_selected.png"
+                SelectedImagePath = "AksIcon/ykq_kaiguang_selected.png"
             };
             switchFl.AddChidren(switchBtn);
-            switchBtn.MouseUpEventHandler += (senser, e) =>
+            switchBtn.MouseDownEventHandler += (senser, e) =>
+            {
+                switchBtn.IsSelected = true;
+            };
+            switchBtn.MouseUpOutsideEventHandler += (senser, e) =>
             {
                 switchBtn.IsSelected = false;
             };
 
-            int h = 49-6;
+            int h = 49 - 6;
             int offset = 28;//x杞村亸绉婚噺
             int septal = 36;//闂撮殧
             #region
@@ -748,7 +761,7 @@
             var baseFl = new BaseFramLayout
             {
                 Y = line8Fl.Bottom,
-                Height = Application.GetRealHeight(207-32-12),
+                Height = Application.GetRealHeight(207 - 32 - 12),
             };
             layout.AddChidren(baseFl);
 
@@ -763,7 +776,12 @@
                 SelectedImagePath = "AksIcon/ykq_yingliangjia_selected.png",
             };
             baseFl.AddChidren(btnYingliangjia);
-            btnYingliangjia.MouseUpEventHandler += (sen,e) => {
+            btnYingliangjia.MouseDownEventHandler += (sen, e) =>
+            {
+                btnYingliangjia.IsSelected = true;
+            };
+            btnYingliangjia.MouseUpOutsideEventHandler += (sen, e) =>
+            {
 
                 btnYingliangjia.IsSelected = false;
             };
@@ -779,14 +797,20 @@
                 SelectedImagePath = "AksIcon/ykq_yingliangjian_selected.png",
             };
             baseFl.AddChidren(btnYingliangjian);
-            btnYingliangjian.MouseUpEventHandler += (sen, e) => {
+            btnYingliangjian.MouseDownEventHandler += (sen, e) =>
+            {
+
+                btnYingliangjian.IsSelected = true;
+            };
+            btnYingliangjian.MouseUpOutsideEventHandler += (sen, e) =>
+            {
 
                 btnYingliangjian.IsSelected = false;
             };
 
 
 
-            btnPindaojia = new Button 
+            btnPindaojia = new Button
             {
                 Y = Application.GetRealHeight(16),
                 X = Application.GetRealWidth(170),
@@ -796,7 +820,13 @@
                 SelectedImagePath = "AksIcon/ykq_pindaojia_selected.png",
             };
             baseFl.AddChidren(btnPindaojia);
-            btnPindaojia.MouseUpEventHandler += (sen, e) => {
+            btnPindaojia.MouseDownEventHandler += (sen, e) =>
+            {
+
+                btnPindaojia.IsSelected = true;
+            };
+            btnPindaojia.MouseUpOutsideEventHandler += (sen, e) =>
+            {
 
                 btnPindaojia.IsSelected = false;
             };
@@ -812,7 +842,14 @@
                 SelectedImagePath = "AksIcon/ykq_pindaojian_selected.png",
             };
             baseFl.AddChidren(btnPindaojian);
-            btnPindaojian.MouseUpEventHandler += (sen, e) => {
+            btnPindaojian.MouseDownEventHandler += (sen, e) =>
+            {
+
+                btnPindaojian.IsSelected = true;
+            };
+
+            btnPindaojian.MouseUpOutsideEventHandler += (sen, e) =>
+            {
 
                 btnPindaojian.IsSelected = false;
             };
@@ -880,27 +917,57 @@
 
 
 
-            btnLeft.MouseUpEventHandler += (sender, e) =>
+
+
+            btnLeft.MouseUpOutsideEventHandler += (sender, e) =>
             {
                 okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
 
             };
-            btnShang.MouseUpEventHandler += (sender, e) =>
+            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.MouseUpEventHandler += (sender, e) =>
+            btnRight.MouseDownEventHandler += (sender, e) =>
+            {
+                okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";
+
+            };
+            btnRight.MouseUpOutsideEventHandler += (sender, e) =>
             {
                 okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
 
             };
-            btnXia.MouseUpEventHandler += (sender, e) =>
+
+            btnXia.MouseDownEventHandler += (sender, e) =>
+            {
+                okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";
+
+            };
+
+            btnXia.MouseUpOutsideEventHandler += (sender, e) =>
             {
                 okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
 
             };
-            btnOk.MouseUpEventHandler += (sender, e) =>
+            btnOk.MouseDownEventHandler += (sender, e) =>
+            {
+                okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
+
+            };
+            btnOk.MouseUpOutsideEventHandler += (sender, e) =>
             {
                 okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
 
@@ -1050,7 +1117,7 @@
             dengguanFL.AddTextButtonView();
             dengguanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dengguan.png";
             dengguanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dengguang_selected.png";
-            dengguanFL.GetTextButton().Text = "鐏叧";
+            dengguanFL.GetTextButton().Text = "鐏厜1";
             dengguanFL.AddClickView();
 
 
@@ -1073,7 +1140,7 @@
             dankongdengFL.AddTextButtonView();
             dankongdengFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dankongdeng.png";
             dankongdengFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dankongdeng_selected.png";
-            dankongdengFL.GetTextButton().Text = "鍗曟帶鐏�";
+            dankongdengFL.GetTextButton().Text = "鐏厜2";
             dankongdengFL.AddClickView();
 
             #endregion
@@ -1109,11 +1176,11 @@
 
                 if (tyySingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48))
                 {
-                    tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101  - 48) + tyySingleFramLayout.btnName.GetTextWidth();
+                    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.btnName.Width = tyySingleFramLayout.btnName.GetTextWidth();
                     tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
-                } 
+                }
 
             }
             else
@@ -1122,7 +1189,7 @@
                 typeMultiFramLayout = new TypeMultiFramLayout();
                 typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
                 typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
             }
 
             this.AdjustRealHeight(16);
@@ -1133,15 +1200,15 @@
         /// </summary>
         /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
         /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-     
-        private void KeyControl(string keypad, string keyName,bool isSupport=true)
+
+        private void KeyControl(string keypad, string keyName, bool isSupport = true)
         {
             //CommonMethod.Current.Loading.Start();
             CommonMethod.Current.SunThread(() =>
             {
                 try
                 {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
+                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
                 }
                 catch { }
                 finally
@@ -1163,7 +1230,7 @@
     class CustomFrameLayout : FrameLayout
     {
         public const int widthFrameLayout = 36;
-        public const int heightFrameLayout = 49-6;
+        public const int heightFrameLayout = 49 - 6;
         public CustomFrameLayout(int width = widthFrameLayout, int height = heightFrameLayout)
         {
             this.Width = Application.GetRealWidth(width);
@@ -1185,7 +1252,7 @@
             SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
             TextAlignment = TextAlignment.Center,
             Gravity = Gravity.CenterHorizontal,
-            Padding=new Padding(0,0,0,0),
+            Padding = new Padding(0, 0, 0, 0),
         };
         Button btnNumber = new Button
         {
@@ -1204,7 +1271,7 @@
             Height = Application.GetRealWidth(12),
             Gravity = Gravity.Center,
             Radius = (uint)Application.GetRealWidth(6),
-            BackgroundColor=0x00000000,
+            BackgroundColor = 0x00000000,
             SelectedBackgroundColor = 0xFFF2F3F7,
         };
 
@@ -1273,7 +1340,7 @@
                 btnNumber.IsSelected = true;
                 btn.IsSelected = true;
 
-                action?.Invoke();
+
             };
 
             clickFl.MouseUpEventHandler += (sender, e) =>
@@ -1283,6 +1350,16 @@
                 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