From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index eb85390..977282f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -67,30 +67,30 @@
                 {
                     return;
                 }
-                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);
 
             });
             menuFram.SetOkClickListener((keypadEntity) =>
             {
-                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
             });
 
 
@@ -181,9 +181,11 @@
                 bfqSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                 bfqSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                 bfqSingleFramLayout.btnLeftImage.Visible = false;
-
-
-
+                bfqSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.left,
+                    bfqSingleFramLayout.singleFramLayout,
+                    bfqSingleFramLayout.btnName,
+                     bfqSingleFramLayout.btnRightImage,
+                     48);
 
                 //褰卞簱
                 ykSingleFramLayout = new TypeSingleFramLayout();
@@ -224,7 +226,7 @@
                 typeMultiFramLayout.AddView(cornerBottomFram);
                 typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                 //typeMultiFramLayout.btnBottonRightName.TextID = StringId.bofangqi;
-                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
 
                 this.AdjustRealHeight(16);
             }
@@ -235,14 +237,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