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/TyyPage.cs |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index 63f2a72..1f1afab 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -64,37 +64,37 @@
             //鍔熻兘閿帶鍒�
             cornerTopFram.selectKeyAction += (keypadEntity) =>
             {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
             };
 
             //鑿滃崟涓婃寜閿�
             menuFram.SetTopClickListener((keypadEntity) =>
             {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
             });
             //鑿滃崟涓嬫寜閿�
             menuFram.SetBottomClickListener((keypadEntity) =>
             {
 
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
             });
             //鑿滃崟宸︽寜閿�
             menuFram.SetLeftClickListener((keypadEntity) =>
             {
 
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
             });
             //鑿滃崟鍙虫寜閿�
             menuFram.SetRightClickListener((keypadEntity) =>
             {
 
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
             });
             //鑿滃崟ok鎸夐敭
             menuFram.SetOkClickListener((keypadEntity) =>
             {
 
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
             });
             if (typeMultiFramLayout != null)
             {
@@ -177,13 +177,19 @@
                 tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                 tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                 tyySingleFramLayout.btnLeftImage.Visible = false;
+               tyySingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+                    tyySingleFramLayout.singleFramLayout,
+                    tyySingleFramLayout.btnName,
+                     tyySingleFramLayout.btnRightImage,
+                     48,200);
+
             }
             else
             {
                 typeMultiFramLayout = new TypeMultiFramLayout();
                 typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                 typeMultiFramLayout.AddView(cornerBottomFram);
-                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
             }
 
             this.AdjustRealHeight(16);
@@ -194,14 +200,15 @@
         /// </summary>
         /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
         /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
-        private void KeyControl(string keypad, string keyName)
+        /// <param name="isSupport"><鏄惁鏀寔鎺у埗/param>
+        private void KeyControl(string keypad, string keyName, bool isSupport)
         {
             //CommonMethod.Current.Loading.Start();
             CommonMethod.Current.SunThread(() =>
             {
                 try
                 {
-                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
                 }
                 catch { }
                 finally

--
Gitblit v1.8.0