mac
2023-10-14 b55fe675d1dd17748a29e4e7de60d14e36740a6e
2023年10月14日13:01:27

第二次视觉走查
15个文件已修改
296 ■■■■■ 已修改文件
HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HDL_ON/UI/UI2/FuntionControlView/Aks/AksListPage.cs
@@ -158,6 +158,7 @@
            btnName.TextColor = CSS_Color.FirstLevelTitleColor;
            btnName.TextAlignment = TextAlignment.CenterLeft;
            btnName.Text = i_device.name;
            btnName.TextSize = CSS_FontSize.TextFontSize;
            frameBack.AddChidren(btnName, ChidrenBindMode.BindEvent);
            var btnCollection = new Button()
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
@@ -11,6 +11,7 @@
using System.Linq;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using System.Reflection;
using System.Collections;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
{
@@ -64,7 +65,7 @@
        /// <summary>
        /// 记录当前设备
        /// </summary>
        public IntType currnetIntType= IntType.none;
        public IntType currnetIntType = IntType.none;
        /// <summary>
        /// 记录当前选择的索引值
        /// </summary>
@@ -191,6 +192,7 @@
                {
                    this.remoteControlList = SendMethod.Current.GetRemoteControlLits(this.device.deviceId);
                    this.sequencerList = SendMethod.Current.GetSequencerLits(this.device.deviceId);
                    TestData(this.remoteControlList);
                }
                catch { }
                finally
@@ -213,7 +215,7 @@
                                var type = (IntType)this.remoteControlList[this.indexValue].type;
                                this.SwitchUI(type);
                            }
                        }
                    });
@@ -324,11 +326,12 @@
            var deviceTypeList = GetRemoteControlList();
            ///之前的状态文本
            string ccurrnetDeviceStr = "";
            if (indexValue!=-1&& indexValue< deviceTypeList.Count) {
                ccurrnetDeviceStr= deviceTypeList[indexValue].name;
            if (indexValue != -1 && indexValue < deviceTypeList.Count)
            {
                ccurrnetDeviceStr = deviceTypeList[indexValue].name;
            }
            PublicInterface conditionView = new PublicInterface();
            conditionView.SingleSelectionShow(this, deviceTypeList,"设备选择", ccurrnetDeviceStr
            conditionView.SingleSelectionShow(this, deviceTypeList, "设备选择", ccurrnetDeviceStr
               , (index) =>
               {
                   var remoteControl = deviceTypeList[index];
@@ -339,7 +342,7 @@
               });
        }
        public enum IntType
@@ -392,9 +395,9 @@
        /// </summary>
        /// <param name="type">(1 = 播放器,2 = 功放,3 = 电视,4 = 机顶盒,5 = 投影仪,6 = 万能遥控器)</param>
        /// <returns></returns>
        private bool isExistType(IntType type)
        private bool isExistType(IntType type)
        {
            var remoteControls = this.GetRemoteControlList();
            for (int i = 0; i < remoteControls.Count; i++)
            {
@@ -410,5 +413,16 @@
        }
        private void TestData(List<RemoteControlEntity> list)
        {
            list.Add(new RemoteControlEntity { deviceId = "33331", rcId = "1", type = 1, name = "播放器" });
            list.Add(new RemoteControlEntity { deviceId = "33332", rcId = "2", type = 2, name = "功放" });
            list.Add(new RemoteControlEntity { deviceId = "33333", rcId = "3", type = 3, name = "电视" });
            list.Add(new RemoteControlEntity { deviceId = "33334", rcId = "4", type = 4, name = "机顶盒" });
            list.Add(new RemoteControlEntity { deviceId = "33335", rcId = "5", type = 5, name = "投影仪" });
            list.Add(new RemoteControlEntity { deviceId = "33336", rcId = "6", type = 6, name = "万能遥控器" });
        }
    }
}
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/BaseFramLayout.cs
@@ -7,8 +7,20 @@
        public BaseFramLayout()
        {
        }
        /// <summary>
        /// 是否可以点击
        /// </summary>
        private bool mIsClick = true;
        /// <summary>
        /// 设置控制点击事件
        /// </summary>
        /// <param name="isClick">false点击无效</param>
        public void setClick(bool isClick)
        {
            this.mIsClick = isClick;
        }
        /// <summary>
        /// 调整真实高度
        /// </summary>
        /// <param name="bottomSpace">底部高度(非真实值)</param>
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs
@@ -14,6 +14,8 @@
        public const int lineW = 1;
        public const int cornerValue = 8;
        public ButtonFramLayout(int width= widthFrameLayout, int height= heightFrameLayout)
        {
            this.Width = Application.GetRealWidth(width);
@@ -39,7 +41,7 @@
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.Center,
            Gravity = Gravity.CenterHorizontal,
            Padding = new Padding(0, 10, 0, 10),
            Padding = new Padding(0, 0, 0, 0),
            Name = "btnName",
@@ -150,33 +152,33 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                this.BackgroundColor = 0x00000000;
                action?.Invoke(this, btnImage, btnName);
                //弹起来还原背景颜色
            };
            btnImage.Tag = this.Tag;
            btnName.Tag = this.Tag;
            this.MouseUpEventHandler += UpClick;
            btnImage.MouseUpEventHandler += UpClick;
            btnName.MouseUpEventHandler += UpClick;
            //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
            //{
            //    this.BackgroundColor = 0x00000000;
            //    //弹起来还原背景颜色
            //};
            //this.MouseMoveEventHandler += MoveClick;
            //btnImage.MouseMoveEventHandler += MoveClick;
            //btnName.MouseMoveEventHandler += MoveClick;
            EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
            {
                this.BackgroundColor = 0x00000000;
                //弹起来还原背景颜色
            };
            this.MouseUpOutsideEventHandler += CancelClick;
            btnImage.MouseUpOutsideEventHandler += CancelClick;
            btnName.MouseUpOutsideEventHandler += CancelClick;
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                //按下去改变背景颜色
                this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
                action?.Invoke(this, btnImage, btnName);
            };
            this.MouseDownEventHandler += DownClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs
@@ -131,7 +131,7 @@
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
                    buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
@@ -219,7 +219,7 @@
                    buttonFram.Enable = false;
                    buttonFram.GetImageButton().Enable = false;
                    buttonFram.GetNameButton().Enable = false;
                    buttonFram.BackgroundColor = AksCommonMethod.unBackgroundColor;
                    buttonFram.GetNameButton().TextColor = AksCommonMethod.unBackgroundColor;
                }
                buttonFram.SetClickListener((fl, btnIcon, btnName) =>
                {
@@ -252,7 +252,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);
@@ -289,19 +289,27 @@
                if (!keypad.isClicked)
                {
                    button.Enable = false;
                    button.BackgroundColor = AksCommonMethod.unBackgroundColor;
                    button.TextColor = AksCommonMethod.unBackgroundColor;
                }
                button.MouseDownEventHandler += (sen, e) =>
                {
                    button.IsSelected = true;
                };
                button.MouseUpOutsideEventHandler += (sen, e) =>
                {
                    button.IsSelected = true;
                };
                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;
                };
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ImageFramlayout.cs
@@ -68,8 +68,8 @@
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                //this.BackgroundColor = 0x00000000;
                //弹起来还原背景颜色
                action?.Invoke(this);
            };
            this.MouseUpEventHandler += UpClick;
            btnImage.MouseUpEventHandler += UpClick;
@@ -77,20 +77,21 @@
            btnName.MouseUpEventHandler += UpClick;
            //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
            //{
            //    this.BackgroundColor = 0x00000000;
            //    //弹起来还原背景颜色
            //};
            //this.MouseMoveEventHandler += MoveClick;
            //btnImage.MouseMoveEventHandler += MoveClick;
            //btnName.MouseMoveEventHandler += MoveClick;
            EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
            {
                //this.BackgroundColor = 0x00000000;
                //弹起来还原背景颜色
            };
            this.MouseUpOutsideEventHandler += CancelClick;
            btnImage.MouseUpOutsideEventHandler += CancelClick;
            btnScore.MouseUpOutsideEventHandler += CancelClick;
            btnName.MouseUpOutsideEventHandler += CancelClick;
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                //按下去改变背景颜色
                //this.BackgroundColor = AksCommonMethod.seleBackgroundColor;
                action?.Invoke(this);
            };
            this.MouseUpEventHandler += DownClick;
            btnImage.MouseUpEventHandler += DownClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs
@@ -22,8 +22,8 @@
        {
            Y = Application.GetRealWidth(16),
            X = Application.GetRealWidth(78),
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealHeight(20),
            Width = Application.GetRealWidth(24),//高度和宽高不一样,以宽度为维度计算,否则变形
            Height = Application.GetRealWidth(20),
            UnSelectedImagePath = "AksIcon/shang.png",
            SelectedImagePath = "AksIcon/shang_selected.png",
            Name = "上",
@@ -40,7 +40,7 @@
            Y = Application.GetRealWidth(144),
            X = Application.GetRealWidth(78),
            Width = Application.GetRealWidth(24),
            Height = Application.GetRealHeight(20),
            Height = Application.GetRealWidth(20),
            UnSelectedImagePath = "AksIcon/xia.png",
            SelectedImagePath = "AksIcon/xia_selected.png",
            Name = "下",
@@ -57,7 +57,7 @@
            Y = Application.GetRealWidth(78),
            X = Application.GetRealWidth(16),
            Width = Application.GetRealWidth(20),
            Height = Application.GetRealHeight(24),
            Height = Application.GetRealWidth(24),
            UnSelectedImagePath = "AksIcon/zuo.png",
            SelectedImagePath = "AksIcon/zuo_selected.png",
            Name = "左",
@@ -76,7 +76,7 @@
            Y = Application.GetRealWidth(78),
            X = Application.GetRealWidth(144),
            Width = Application.GetRealWidth(20),
            Height = Application.GetRealHeight(24),
            Height = Application.GetRealWidth(24),
            UnSelectedImagePath = "AksIcon/you.png",
            SelectedImagePath = "AksIcon/you_selected.png",
            Name = "右",
@@ -94,7 +94,7 @@
        Button btnOkbj = new Button
        {
            Gravity=Gravity.Center,
            Gravity = Gravity.Center,
            Width = Application.GetRealWidth(76),
            Height = Application.GetRealWidth(76),
            Radius = (uint)Application.GetRealWidth(38),
@@ -140,6 +140,10 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnTop.Name;
                keypadEntity.keypad = "key_up";
                action?.Invoke(keypadEntity);
                btnTop.IsSelected = false;
                //弹起来还原背景颜色
            };
@@ -151,10 +155,6 @@
            {
                //按下去改变背景颜色
                btnTop.IsSelected = true;
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnTop.Name;
                keypadEntity.keypad = "key_up";
                action?.Invoke(keypadEntity);
            };
            btnTop.MouseDownEventHandler += DownClick;
            btnTopClick.MouseDownEventHandler += DownClick;
@@ -168,9 +168,11 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnBottom.Name;
                keypadEntity.keypad = "key_down";
                action?.Invoke(keypadEntity);
                btnBottom.IsSelected = false;
                //弹起来还原背景颜色
            };
            btnBottom.MouseUpEventHandler += UpClick;
@@ -180,10 +182,7 @@
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                btnBottom.IsSelected = true;
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnBottom.Name;
                keypadEntity.keypad = "key_down";
                action?.Invoke(keypadEntity);
                //按下去改变背景颜色
            };
            btnBottom.MouseDownEventHandler += DownClick;
@@ -197,6 +196,10 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnLeft.Name;
                keypadEntity.keypad = "key_left";
                action?.Invoke(keypadEntity);
                btnLeft.IsSelected = false;
                //弹起来还原背景颜色
            };
@@ -207,10 +210,6 @@
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                btnLeft.IsSelected = true;
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnLeft.Name;
                keypadEntity.keypad = "key_left";
                action?.Invoke(keypadEntity);
                //按下去改变背景颜色
            };
            btnLeft.MouseDownEventHandler += DownClick;
@@ -225,6 +224,10 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnRight.Name;
                keypadEntity.keypad = "key_right";
                action?.Invoke(keypadEntity);
                btnRight.IsSelected = false;
                //弹起来还原背景颜色
            };
@@ -236,10 +239,7 @@
            {
                //按下去改变背景颜色
                btnRight.IsSelected = true;
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnRight.Name;
                keypadEntity.keypad = "key_right";
                action?.Invoke(keypadEntity);
            };
            btnRight.MouseDownEventHandler += DownClick;
            btnRightClick.MouseDownEventHandler += DownClick;
@@ -255,6 +255,10 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnOk.Name;
                keypadEntity.keypad = "key_ok";
                action?.Invoke(keypadEntity);
                btnOk.IsSelected = false;
                //弹起来还原背景颜色
            };
@@ -264,10 +268,6 @@
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                btnOk.IsSelected = true;
                KeypadEntity keypadEntity = new KeypadEntity();
                keypadEntity.name = btnOk.Name;
                keypadEntity.keypad = "key_ok";
                action?.Invoke(keypadEntity);
                //按下去改变背景颜色
            };
            btnOk.MouseDownEventHandler += DownClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs
@@ -5,7 +5,19 @@
{
    public class TypeMultiFramLayout
    {
        /// <summary>
        /// 是否可以点击
        /// </summary>
        private bool mIsClick = true;
        /// <summary>
        /// 设置控制点击事件
        /// </summary>
        /// <param name="isClick">false点击无效</param>
        public void setClick(bool isClick)
        {
            this.mIsClick = isClick;
        }
        private uint UpBackgroundColor = MusicColor.ViewColor;
        private uint DownBackgroundColor = AksCommonMethod.seleBackgroundColor;
@@ -164,8 +176,9 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                action?.Invoke(rightFramLayout);
                //rightFramLayout.BackgroundColor = this.UpBackgroundColor;
                //弹起来还原背景颜色
            };
            rightFramLayout.MouseUpEventHandler += UpClick;
@@ -177,7 +190,7 @@
            {
                //按下去改变背景颜色
                //rightFramLayout.BackgroundColor =AksCommonMethod.seleBackgroundColor;
                action?.Invoke(rightFramLayout);
            };
            rightFramLayout.MouseDownEventHandler += DownClick;
            btnBottonRightImage.MouseDownEventHandler += DownClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs
@@ -6,7 +6,19 @@
{
    public class TypeSingleFramLayout
    {
        /// <summary>
        /// 是否可以点击
        /// </summary>
        private bool mIsClick = true;
        /// <summary>
        /// 设置控制点击事件
        /// </summary>
        /// <param name="isClick">false点击无效</param>
        public void setClick(bool isClick)
        {
            this.mIsClick = isClick;
        }
        private uint UpBackgroundColor = MusicColor.ViewColor;
        private uint DownBackgroundColor = AksCommonMethod.seleBackgroundColor;
        /// <summary>
@@ -88,8 +100,9 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                action?.Invoke(singleFramLayout);
                //singleFramLayout.BackgroundColor = this.UpBackgroundColor;
                //弹起来还原背景颜色
            };
            singleFramLayout.MouseUpEventHandler += UpClick;
@@ -101,7 +114,7 @@
            {
                //按下去改变背景颜色
                //singleFramLayout.BackgroundColor = this.DownBackgroundColor;
                action?.Invoke(singleFramLayout);
            };
            singleFramLayout.MouseDownEventHandler += DownClick;
            btnLeftImage.MouseDownEventHandler += DownClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/VerticalBoutonFLayout.cs
@@ -5,7 +5,19 @@
{
    public class VerticalBoutonFLayout:BaseFramLayout
    {
        /// <summary>
        /// 是否可以点击
        /// </summary>
        private bool mIsClick = true;
        /// <summary>
        /// 设置控制点击事件
        /// </summary>
        /// <param name="isClick">false点击无效</param>
        public void setClick(bool isClick)
        {
            this.mIsClick = isClick;
        }
        public const int widthFrameLayout = 80;
        public const int heightFrameLayout = 140-15;
        public const int cornerValue = 12;
@@ -133,30 +145,30 @@
        {
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                action?.Invoke(OFFFLayout, OFFButton);
                OFFFLayout.BackgroundColor = MusicColor.WhiteColor;
                OFFButton.TextColor = 0xFFA5AEBC;
                //弹起来还原背景颜色
            };
            OFFFLayout.MouseUpEventHandler += UpClick;
            OFFButton.MouseUpEventHandler += UpClick;
            //EventHandler<MouseEventArgs> MoveClick = (sender, e) =>
            //{
            //    this.BackgroundColor = 0x00000000;
            //    //弹起来还原背景颜色
            //};
            //this.MouseMoveEventHandler += MoveClick;
            //btnImage.MouseMoveEventHandler += MoveClick;
            //btnName.MouseMoveEventHandler += MoveClick;
            EventHandler<MouseEventArgs> CancelClick = (sender, e) =>
            {
                OFFFLayout.BackgroundColor = MusicColor.WhiteColor;
                OFFButton.TextColor = 0xFFA5AEBC;
                //弹起来还原背景颜色
            };
            OFFFLayout.MouseUpOutsideEventHandler += CancelClick;
            OFFButton.MouseUpOutsideEventHandler += CancelClick;
            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                //按下去改变背景颜色
                OFFFLayout.BackgroundColor = MusicColor.MusicTxet14SelectedColor;
                OFFButton.TextColor = MusicColor.WhiteColor;
                action?.Invoke(OFFFLayout, OFFButton);
            };
            OFFFLayout.MouseDownEventHandler += DownClick;
            OFFButton.MouseDownEventHandler += DownClick;
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -177,6 +177,7 @@
                TextSize = TextSize.Text16,
                TextID = StringId.pindao,
                Padding = new Padding(0, 0, 0, 0),
                IsBold = true,
            };
            leftLayout.AddChidren(leftBtnTitle);
@@ -220,6 +221,7 @@
                TextSize = TextSize.Text16,
                TextID = StringId.kongzhi,
                Padding = new Padding(0, 0, 0, 0),
                IsBold=true,
            };
            rightLayout.AddChidren(rightBtnTitle);
@@ -248,9 +250,9 @@
            //数字按键容器
            numberFrame = new CornerFramLayout(343, 368, 17);
            numberFrame = new CornerFramLayout(343, 368-24, 17);
            numberFrame.X = Application.GetRealWidth(16);
            numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
            numberFrame.Y = middLayout.Bottom;
            numberFrame.BackgroundColor = MusicColor.WhiteColor;
            numberFrame.SetMargin(16, 0, 16, 0);
            numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
@@ -260,7 +262,7 @@
            //菜单容器
            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
            cornerBottomFram.X = Application.GetRealWidth(16);
            cornerBottomFram.Y = middLayout.Bottom + Application.GetRealHeight(16);
            cornerBottomFram.Y = middLayout.Bottom;
            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
            this.AddChidren(cornerBottomFram);
HDL_ON/UI/UI2/FuntionControlView/Aks/SendMethod.cs
@@ -119,6 +119,7 @@
                    remoteControl.deviceId = deviceId;
                }
            }
            return list;
        }
HDL_ON/UI/UI2/FuntionControlView/Aks/SxqPage.cs
@@ -47,6 +47,13 @@
        public SxqPage(List<SequencerEntity> sequencerList, string deviceId)
        {
            this.sequencerList = sequencerList;
            for (int i = 0; i < 12; i++) {
                this.sequencerList.Add(new SequencerEntity {seqId=i.ToString(),name=i.ToString(),type=1 });
            }
            for (int i = 0; i < 4; i++)
            {
                this.sequencerList.Add(new SequencerEntity { seqId = i.ToString(), name = i.ToString(), type = 2 });
            }
            this.deviceId = deviceId;
        }
        public void Show()
@@ -97,7 +104,7 @@
                VerticalBoutonFLayout buttonFram = new VerticalBoutonFLayout();
                buttonFram.AddView(fLayout);
                buttonFram.Tag = sequencer;
                buttonFram.Y = Application.GetRealWidth(16) + Application.GetRealHeight((VerticalBoutonFLayout.heightFrameLayout + 16) * line);
                buttonFram.Y = Application.GetRealWidth(16) + Application.GetRealHeight((VerticalBoutonFLayout.heightFrameLayout + 8) * line);
                buttonFram.X = Application.GetRealWidth(16) + Application.GetRealWidth((VerticalBoutonFLayout.widthFrameLayout + 8) * xCount);
                buttonFram.btnName.Text = sequencer.name;
                xCount++;
@@ -127,7 +134,7 @@
            }
            fLayout.AdjustRealHeight(16);
            fLayout.AdjustRealHeight(8);
            var list2 = this.sequencerList.FindAll((o) => o.type == 2);
            for (int i = 0; i < list2.Count; i++)
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -181,6 +181,7 @@
                TextSize = TextSize.Text16,
                TextID = StringId.pindao,
                Padding = new Padding(0, 0, 0, 0),
                IsBold = true,
            };
            leftLayout.AddChidren(leftBtnTitle);
@@ -224,6 +225,7 @@
                TextSize = TextSize.Text16,
                TextID = StringId.kongzhi,
                Padding = new Padding(0, 0, 0, 0),
                IsBold = true,
            };
            rightLayout.AddChidren(rightBtnTitle);
@@ -250,11 +252,11 @@
            #endregion
            //数字按键容器
            numberFrame = new CornerFramLayout(343, 368, 17);
            numberFrame = new CornerFramLayout(343, 368-24, 17);
            numberFrame.X = Application.GetRealWidth(16);
            numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
            numberFrame.Y = middLayout.Bottom;
            numberFrame.BackgroundColor = MusicColor.WhiteColor;
            numberFrame.SetMargin(16,0,16,0);
            numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList(this.remoteControl));
@@ -264,7 +266,7 @@
            //菜单容器
            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
            cornerBottomFram.X = Application.GetRealWidth(16);
            cornerBottomFram.Y = middLayout.Bottom + Application.GetRealHeight(16);
            cornerBottomFram.Y = middLayout.Bottom;
            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
            this.AddChidren(cornerBottomFram);
HDL_ON/UI/UI2/FuntionControlView/Aks/YkqPage.cs
@@ -397,7 +397,7 @@
            {
                Y = btnTitle.Bottom + Application.GetRealHeight(16),
                Width = Application.GetRealWidth(240),
                Height = Application.GetRealHeight(1095),//遥控器固定高度
                Height = Application.GetRealHeight(1095-122),//遥控器固定高度
                Radius = (uint)Application.GetRealHeight(17),
                BackgroundColor = 0xff798394,
                Gravity = Gravity.CenterHorizontal,
@@ -410,7 +410,7 @@
                Y = btnTitle.Bottom + Application.GetRealHeight(16),
                //X = Application.GetRealWidth(71),
                Width = Application.GetRealWidth(232),
                Height = Application.GetRealHeight(1095),//遥控器固定高度
                Height = Application.GetRealHeight(1095-122),//遥控器固定高度
                Radius = (uint)Application.GetRealHeight(17),
                BackgroundColor = 0xff19181E,
                Gravity = Gravity.CenterHorizontal,
@@ -445,7 +445,7 @@
                switchBtn.IsSelected = false;
            };
            int h = 49;
            int h = 49-6;
            int offset = 28;//x轴偏移量
            int septal = 36;//间隔
            #region
@@ -481,7 +481,7 @@
            var line2Fl = new FrameLayout
            {
                Y = line1Fl.Bottom + Application.GetRealHeight(16),
                Y = line1Fl.Bottom + Application.GetRealHeight(8),
                Height = Application.GetRealHeight(h),
            };
            layout.AddChidren(line2Fl);
@@ -521,7 +521,7 @@
            var line3Fl = new FrameLayout
            {
                Y = line2Fl.Bottom + Application.GetRealHeight(16),
                Y = line2Fl.Bottom + Application.GetRealHeight(8),
                Height = Application.GetRealHeight(h),
            };
            layout.AddChidren(line3Fl);
@@ -554,7 +554,7 @@
            var line4Fl = new FrameLayout
            {
                Y = line3Fl.Bottom + Application.GetRealHeight(16),
                Y = line3Fl.Bottom + Application.GetRealHeight(8),
                Height = Application.GetRealHeight(h),
            };
            layout.AddChidren(line4Fl);
@@ -696,7 +696,7 @@
            var line8Fl = new FrameLayout
            {
                Y = line7Fl.Bottom + Application.GetRealHeight(32),
                Y = line7Fl.Bottom + Application.GetRealHeight(16),
                Height = Application.GetRealHeight(h),
            };
            layout.AddChidren(line8Fl);
@@ -741,14 +741,14 @@
            var baseFl = new BaseFramLayout
            {
                Y = line8Fl.Bottom,
                Height = Application.GetRealHeight(207),
                Height = Application.GetRealHeight(207-32-12),
            };
            layout.AddChidren(baseFl);
            btnYingliangjia = new Button
            {
                Y = Application.GetRealHeight(32),
                Y = Application.GetRealHeight(16),
                X = Application.GetRealWidth(26),
                Width = Application.GetRealWidth(36),
                Height = Application.GetRealWidth(36),
@@ -781,7 +781,7 @@
            btnPindaojia = new Button 
            {
                Y = Application.GetRealHeight(32),
                Y = Application.GetRealHeight(16),
                X = Application.GetRealWidth(170),
                Width = Application.GetRealWidth(36),
                Height = Application.GetRealWidth(36),
@@ -814,7 +814,7 @@
            okFl = new FrameLayout
            {
                Y = Application.GetRealHeight(32),
                Y = Application.GetRealHeight(16),
                Height = Application.GetRealWidth(143),
                Width = Application.GetRealWidth(143),
                BackgroundImagePath = "AksIcon/ykq_ok.png",
@@ -939,7 +939,7 @@
            var line10Fl = new FrameLayout
            {
                Y = line9Fl.Bottom + Application.GetRealHeight(16),
                Y = line9Fl.Bottom + Application.GetRealHeight(8),
                Height = Application.GetRealHeight(h),
            };
            layout.AddChidren(line10Fl);
@@ -983,7 +983,7 @@
            var line11Fl = new FrameLayout
            {
                Y = line10Fl.Bottom + Application.GetRealHeight(16),
                Y = line10Fl.Bottom + Application.GetRealHeight(8),
                Height = Application.GetRealHeight(h),
            };
            layout.AddChidren(line11Fl);
@@ -1031,7 +1031,7 @@
            var line12Fl = new FrameLayout
            {
                Y = line11Fl.Bottom + Application.GetRealHeight(16),
                Y = line11Fl.Bottom + Application.GetRealHeight(8),
                Height = Application.GetRealHeight(h),
            };
            layout.AddChidren(line12Fl);