mac
2023-10-12 e4f7080639ee8cbc71172e5202f953924cedc074
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -74,7 +74,7 @@
        /// </summary>
        public List<KeypadEntity> GetTestList()
        {
            return AksCommonMethod.Current.GetTYYKeypadList();
            return AksCommonMethod.Current.GetTYYKeypadList(null);
        }
        /// <summary>
@@ -125,9 +125,17 @@
                    line++;
                    xCount = 0;
                }
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
                    if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
                    if (buttonFram.Tag != null && buttonFram.Tag is KeypadEntity)
                    {
                        selectKeyAction?.Invoke((KeypadEntity)buttonFram.Tag);
                    }
@@ -205,7 +213,14 @@
                    currnetheightValue += ButtonFramLayout.heightFrameLayout;
                    currnetWidthValue = 0;
                }
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
                    if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
@@ -270,6 +285,12 @@
                    currnetheightValue += heightMaxValue;
                    currnetWidthValue = 0;
                }
                //不支持按键点击背景颜色
                if (!keypad.isClicked)
                {
                    button.Enable = false;
                    button.BackgroundColor = AksCommonMethod.unBackgroundColor;
                }
                button.MouseDownEventHandler += (sen, e) =>
                {
                    if (button.Tag == null || ((KeypadEntity)button.Tag).keypad == "none")