Merge branch 'wjc' into Dev-Branch

mac

2023-09-25 2d03454a09569c60ac1e658bacccd2bf0e2d0dfd

 HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs

@@ -58,6 +58,7 @@

            cornerFram.selectKeyAction += (keypadEntity) =>
            {

                if (keypadEntity == null)
                {
                    return;
@@ -123,6 +124,7 @@
                TextSize = TextSize.Text16,
                //TextID = StringId.bofangqi,
                Text = this.remoteControl.name,
                IsBold=true,
            };
            this.AddChidren(btnTitle);

@@ -134,7 +136,7 @@
            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(), 4);


            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364, 17);
            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364-32, 17);
            this.AddChidren(cornerBottomFram);
            cornerBottomFram.X = Application.GetRealWidth(16);
            cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16);