mac
2023-10-17 5ec581e5d37b108fc9d59e89afd8e94e21b32080
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,20 @@
                    line++;
                    xCount = 0;
                }
                //不支持按键点击背景颜色
                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.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 +216,15 @@
                    currnetheightValue += ButtonFramLayout.heightFrameLayout;
                    currnetWidthValue = 0;
                }
                //不支持按键点击背景颜色
                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.SetClickListener((fl, btnIcon, btnName) =>
                {
                    if (buttonFram.Tag != null&& buttonFram.Tag is KeypadEntity)
@@ -237,7 +256,7 @@
            }
            int currnetheightValue = 0;
            int currnetWidthValue = 0;
            int heightMaxValue = 84;
            int heightMaxValue = 84-6;
            int widthMaxValue = 78;
            //获取相对一个纬度值
            int heightDimensionValue = this.Height - Application.GetRealHeight(this.topMargin) - Application.GetRealHeight(this.bottomMargin) - Application.GetRealHeight(heightMaxValue / 2);
@@ -258,8 +277,9 @@
                    IsBold = true,
                    Tag = keypad,
                    BackgroundColor = MusicColor.WhiteColor,
                    SelectedBackgroundColor = 0xFFEFEFEF,
                    SelectedBackgroundColor = 0xFFF2F3F7,
                    Radius = (uint)Application.GetRealHeight(8),
                    SelectedTextColor = MusicColor.TextColor,
                };
                this.AddChidren(button);
@@ -269,17 +289,31 @@
                    currnetheightValue += heightMaxValue;
                    currnetWidthValue = 0;
                }
                //不支持按键点击背景颜色
                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")
                    {
                        return;
                    }
                    button.IsSelected = true;
                    selectKeyAction?.Invoke((KeypadEntity)button.Tag);
                };
                button.MouseUpEventHandler += (sen, e) =>
                {
                    button.IsSelected = false;
                };