mac
2023-10-18 5bd5cdbae1d22b5e14e6933b807ed97b89807b6f
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -4,6 +4,7 @@
using System.Collections.Generic;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView
{
    /// <summary>
@@ -128,20 +129,18 @@
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Alpha =0.5f;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
                    //buttonFram.BackgroundColor =AksCommonMethod.unParentBackgroundColor;
                    buttonFram.SetClick(false);
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
                    if (buttonFram.Tag != null && buttonFram.Tag is KeypadEntity)
                    if (buttonFram.Tag == null)
                    {
                        selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                        return;
                    }
                    selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                });
                //if (defaultIndex != -1 && defaultIndex == i)
@@ -219,18 +218,18 @@
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Alpha = 0.5f;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
                    buttonFram.SetClick(false);
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
                    if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
                    if (buttonFram.Tag == null)
                    {
                        selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                        return;
                    }
                    selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                });
                //if (defaultIndex != -1 && defaultIndex == i)
@@ -292,29 +291,19 @@
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    button.Enable = false;
                    button.TextColor = AksCommonMethod.unBackgroundColor;
                }
                button.MouseDownEventHandler += (sen, e) =>
                {
                    
                    button.IsSelected = true;
                };
                button.MouseUpOutsideEventHandler += (sen, e) =>
                {
                    button.IsSelected = false;
                };
                button.MouseUpEventHandler += (sen, e) =>
                {
                    if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none")
                    if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none"|| !((KeypadEntity)button.Tag).isClicked)
                    {
                        return;
                    }
                    selectKeyAction?.Invoke((KeypadEntity)button.Tag);
                    button.IsSelected = false;
                    SetButtonIsSelected(button);
                };
                //if (defaultIndex != -1 && defaultIndex == i)