2023年10月17日16:53:42

mac

2023-10-17 f222fb8ae7d265f094922f31970e1e805672ee01

2023年10月17日16:53:42

修改视觉问题

 DLL/Android/Shared.Droid.dll

Binary files differ

 DLL/Shared.Droid.dll

Binary files differ

 HDL-ON_Android/Assets/Phone/AksIcon/ykq_kai.png

 HDL-ON_Android/Assets/Phone/AksIcon/ykq_kaiguang_selected.png

 HDL-ON_iOS/Resources/Phone/AksIcon/ykq_kai.png

 HDL-ON_iOS/Resources/Phone/AksIcon/ykq_kaiguang_selected.png

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

@@ -17,13 +17,17 @@
        /// </summary>
        public const uint seleBackgroundColor = 0xFFF2F3F7;
        /// <summary>
        /// 不支持按键颜色
        /// 不支持按键文本颜色
        /// </summary>
        public const uint unBackgroundColor = 0xFFA3AAB7;
        /// <summary>
        /// 不支持整个颜色
        /// </summary>
        public const uint unParentBackgroundColor = 0xFFF2F3F7;

        private static AksCommonMethod commonMethod = null;
        /// <summary>
        /// 获取对象
        /// 获取对象F
        /// </summary>
        public static AksCommonMethod Current
        {
@@ -315,7 +319,7 @@
            keypads.Add(new KeypadEntity { keypad = "look_back", name = "回看", localIconAddress = $"{aksIcon}huikan.png" });
            keypads.Add(new KeypadEntity { keypad = "cancel", name = "取消", localIconAddress = $"{aksIcon}quxiao.png" });
            keypads.Add(new KeypadEntity { keypad = "amplifier_volume_up", name = "功放音量 +", localIconAddress = $"{aksIcon}gfyingliangjia.png" });
            keypads.Add(new KeypadEntity { keypad = "amplifier_volume_down", name = "功放音量 -", localIconAddress = $"{aksIcon}gf_ingliangjian.png" });
            keypads.Add(new KeypadEntity { keypad = "amplifier_volume_down", name = "功放音量 -", localIconAddress = $"{aksIcon}gfyingliangjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_1", name = "自定义按键1", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_2", name = "自定义按键2", localIconAddress = $"{aksIcon}zdyanjian.png" });
            keypads.Add(new KeypadEntity { keypad = "custom_3", name = "自定义按键3", localIconAddress = $"{aksIcon}zdyanjian.png" });

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/ButtonFramLayout.cs

@@ -158,8 +158,6 @@

                //弹起来还原背景颜色
            };
            btnImage.Tag = this.Tag;
            btnName.Tag = this.Tag;
            this.MouseUpEventHandler += UpClick;
            btnImage.MouseUpEventHandler += UpClick;
            btnName.MouseUpEventHandler += UpClick;

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/CornerFramLayout.cs

@@ -129,9 +129,12 @@
                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) =>
                {

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/MenuFramLayout.cs

@@ -158,6 +158,14 @@
            };
            btnTop.MouseDownEventHandler += DownClick;
            btnTopClick.MouseDownEventHandler += DownClick;

            EventHandler<MouseEventArgs> OutsideClick = (sender, e) =>
            {
                //弹起来还原背景颜色
                btnTop.IsSelected = false;
            };
            btnTop.MouseUpOutsideEventHandler += OutsideClick;
            btnTopClick.MouseUpOutsideEventHandler += OutsideClick;
        }

        /// <summary>
@@ -187,6 +195,17 @@
            };
            btnBottom.MouseDownEventHandler += DownClick;
            btnBottomClick.MouseDownEventHandler += DownClick;


            EventHandler<MouseEventArgs> OutsideClick = (sender, e) =>
            {
                //弹起来还原背景颜色
                btnBottom.IsSelected = false;
            };
            btnBottom.MouseUpOutsideEventHandler += OutsideClick;
            btnBottomClick.MouseUpOutsideEventHandler += OutsideClick;


        }
        /// <summary>
        /// 左
@@ -214,6 +233,14 @@
            };
            btnLeft.MouseDownEventHandler += DownClick;
            btnLeftClick.MouseDownEventHandler += DownClick;

            EventHandler<MouseEventArgs> OutsideClick = (sender, e) =>
            {
                //弹起来还原背景颜色
                btnLeft.IsSelected = false;
            };
            btnLeft.MouseUpOutsideEventHandler += OutsideClick;
            btnLeftClick.MouseUpOutsideEventHandler += OutsideClick;

        }
        /// <summary>
@@ -243,6 +270,14 @@
            };
            btnRight.MouseDownEventHandler += DownClick;
            btnRightClick.MouseDownEventHandler += DownClick;

            EventHandler<MouseEventArgs> OutsideClick = (sender, e) =>
            {
                //弹起来还原背景颜色
                btnRight.IsSelected = false;
            };
            btnRight.MouseUpOutsideEventHandler += OutsideClick;
            btnRightClick.MouseUpOutsideEventHandler += OutsideClick;
        }


@@ -271,6 +306,13 @@
                //按下去改变背景颜色
            };
            btnOk.MouseDownEventHandler += DownClick;

            EventHandler<MouseEventArgs> OutsideClick = (sender, e) =>
            {
                //弹起来还原背景颜色
                btnOk.IsSelected = false;
            };
            btnOk.MouseUpOutsideEventHandler += OutsideClick;
        }

    }

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeMultiFramLayout.cs

@@ -46,7 +46,7 @@
        };


        public Button btnBottonLeftImage = new Button
        public Button btnLeftImage = new Button
        {
            Width = Application.GetRealWidth(16),
            Height = Application.GetRealWidth(16),
@@ -55,16 +55,15 @@
            Name = "btnBottonLeftImage",
        };

        public Button btnBottonName = new Button
        public Button btnLeftName = new Button
        {
            Width = Application.GetRealWidth(100),
            Width = Application.GetRealWidth(100 + 10),
            Height = Application.GetRealHeight(23),
            TextID = StringId.shixuqi,
            TextSize = TextSize.Text16,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.CenterLeft,
            Gravity = Gravity.CenterVertical,
            IsMoreLines = true,
        };


@@ -89,7 +88,7 @@
        };


        public Button btnBottonRightImage = new Button
        public Button btnRightImage = new Button
        {
            Width = Application.GetRealWidth(16),
            Height = Application.GetRealWidth(16),
@@ -98,17 +97,16 @@
        };


        public Button btnBottonRightName = new Button
        public Button btnRightName = new Button
        {
            Width = Application.GetRealWidth(100),
            Width = Application.GetRealWidth(100 + 16),
            Height = Application.GetRealHeight(23),
            TextID = StringId.bofangqi,
            TextSize = TextSize.Text16,
            TextColor = MusicColor.TextColor,
            TextAlignment = TextAlignment.CenterRight,
            Gravity = Gravity.CenterVertical,
            Padding=new Padding(0,0,0,0),
            IsMoreLines = true,
            Padding = new Padding(0, 0, 0, 0),
        };


@@ -116,16 +114,16 @@
        {
            layout.AddChidren(multiFramLayout);
            multiFramLayout.AddChidren(leftFramLayout);
            leftFramLayout.AddChidren(btnBottonLeftImage);
            leftFramLayout.AddChidren(btnBottonName);
            leftFramLayout.AddChidren(btnLeftImage);
            leftFramLayout.AddChidren(btnLeftName);
            multiFramLayout.AddChidren(lineFramLayout);
            multiFramLayout.AddChidren(rightFramLayout);
            rightFramLayout.AddChidren(btnBottonRightImage);
            rightFramLayout.AddChidren(btnBottonRightName);
            btnBottonName.X = btnBottonLeftImage.Right + Application.GetRealWidth(4);
            rightFramLayout.AddChidren(btnRightImage);
            rightFramLayout.AddChidren(btnRightName);
            btnLeftName.X = btnLeftImage.Right + Application.GetRealWidth(4);
            lineFramLayout.X = leftFramLayout.Right;
            rightFramLayout.X = lineFramLayout.Right;
            btnBottonRightName.X = btnBottonLeftImage.Right + Application.GetRealWidth(4);
            btnRightName.X = Application.GetRealWidth(4);
        }


@@ -149,12 +147,12 @@
            EventHandler<MouseEventArgs> UpClick = (sender, e) =>
            {
                //leftFramLayout.BackgroundColor = this.UpBackgroundColor;
               

                //弹起来还原背景颜色
            };
            leftFramLayout.MouseUpEventHandler += UpClick;
            btnBottonLeftImage.MouseUpEventHandler += UpClick;
            btnBottonName.MouseUpEventHandler += UpClick;
            btnLeftImage.MouseUpEventHandler += UpClick;
            btnLeftName.MouseUpEventHandler += UpClick;


            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
@@ -164,8 +162,8 @@
                action?.Invoke(leftFramLayout);
            };
            leftFramLayout.MouseDownEventHandler += DownClick;
            btnBottonLeftImage.MouseDownEventHandler += DownClick;
            btnBottonName.MouseDownEventHandler += DownClick;
            btnLeftImage.MouseDownEventHandler += DownClick;
            btnLeftName.MouseDownEventHandler += DownClick;
        }

        /// <summary>
@@ -182,21 +180,21 @@
                //弹起来还原背景颜色
            };
            rightFramLayout.MouseUpEventHandler += UpClick;
            btnBottonRightImage.MouseUpEventHandler += UpClick;
            btnBottonRightName.MouseUpEventHandler += UpClick;
            btnRightImage.MouseUpEventHandler += UpClick;
            btnRightName.MouseUpEventHandler += UpClick;


            EventHandler<MouseEventArgs> DownClick = (sender, e) =>
            {
                //按下去改变背景颜色
                //rightFramLayout.BackgroundColor =AksCommonMethod.seleBackgroundColor;
               

            };
            rightFramLayout.MouseDownEventHandler += DownClick;
            btnBottonRightImage.MouseDownEventHandler += DownClick;
            btnBottonRightName.MouseDownEventHandler += DownClick;
            btnRightImage.MouseDownEventHandler += DownClick;
            btnRightName.MouseDownEventHandler += DownClick;
        }
       



    }

 HDL_ON/UI/UI2/FuntionControlView/Aks/CommonView/TypeSingleFramLayout.cs

@@ -29,8 +29,8 @@
            BackgroundColor = MusicColor.ViewColor,
            //Gravity = Gravity.CenterHorizontal,
            Width = Application.GetRealWidth(101),
            Height = Application.GetRealHeight(40),
            Radius = (uint)Application.GetRealHeight(20),
            Height = Application.GetRealHeight(34),//40
            Radius = (uint)Application.GetRealHeight(17),
        };

        public Button btnLeftImage = new Button

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

@@ -155,7 +155,7 @@
                typeMultiFramLayout = new TypeMultiFramLayout();
                typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
                typeMultiFramLayout.AddView(cornerBottomFram);
                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;

            }
            this.AdjustRealHeight(16);

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

@@ -308,7 +308,7 @@
                typeMultiFramLayout = new TypeMultiFramLayout();
                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                typeMultiFramLayout.AddView(cornerBottomFram);
                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
            }

            //初始值

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

@@ -224,7 +224,7 @@
                typeMultiFramLayout.AddView(cornerBottomFram);
                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                //typeMultiFramLayout.btnBottonRightName.TextID = StringId.bofangqi;
                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;

                this.AdjustRealHeight(16);
            }

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

@@ -315,7 +315,7 @@
                typeMultiFramLayout = new TypeMultiFramLayout();
                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                typeMultiFramLayout.AddView(cornerBottomFram);
                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
            }

            //初始值

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

@@ -183,7 +183,7 @@
                typeMultiFramLayout = new TypeMultiFramLayout();
                typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                typeMultiFramLayout.AddView(cornerBottomFram);
                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
            }

            this.AdjustRealHeight(16);

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

@@ -35,7 +35,7 @@
        /// <summary>
        /// 切换设备容器
        /// </summary>
        TypeMultiFramLayout typeMultiFramLayout; 
        TypeMultiFramLayout typeMultiFramLayout;
        TypeSingleFramLayout tyySingleFramLayout;

        Button switchBtn;
@@ -106,9 +106,9 @@
        private void EventListener()
        {
            //开关
            switchBtn.MouseDownEventHandler += (senser, e) =>
            switchBtn.MouseUpEventHandler += (senser, e) =>
            {
                switchBtn.IsSelected = true;
                switchBtn.IsSelected = false;
                KeyControl("on_off", "开/关");
            };
            //信息
@@ -154,7 +154,7 @@
            //1
            number1FL.SetClickListener(() =>
            {
                 KeyControl("number_1", "1");
                KeyControl("number_1", "1");
            });
            //2
            number2FL.SetClickListener(() =>
@@ -237,16 +237,16 @@

            });
            //左
            btnLeft.MouseDownEventHandler += (sender, e) =>
            btnLeft.MouseUpEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
                KeyControl("key_left", "左");

            };
            //上
            btnShang.MouseDownEventHandler += (sender, e) => 
            btnShang.MouseUpEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_shang_selected.png";
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
                KeyControl("key_up", "上");

            };
@@ -254,41 +254,48 @@
            //右
            btnRight.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";

                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";
                KeyControl("key_right", "右");

            };

            //下
            btnXia.MouseDownEventHandler += (sender, e) =>
            btnXia.MouseUpEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";

                KeyControl("key_down", "下");
            };
            //OK
            btnOk.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";

                KeyControl("key_ok", "确定");
            };
            //音量+
            btnYingliangjia.MouseDownEventHandler += (sen, e) => {
                btnYingliangjia.IsSelected = true;
            btnYingliangjia.MouseUpEventHandler += (sen, e) =>
            {
                btnYingliangjia.IsSelected = false;
                KeyControl("volume_up", "音量+");
            };
            //音量-
            btnYingliangjian.MouseDownEventHandler += (sen, e) => {
                btnYingliangjian.IsSelected = true;
            btnYingliangjian.MouseUpEventHandler += (sen, e) =>
            {
                btnYingliangjian.IsSelected = false;
                KeyControl("volume_down", "音量-");
            };
            //频道+
            btnPindaojia.MouseDownEventHandler += (sen, e) => {
                btnPindaojia.IsSelected = true;
            btnPindaojia.MouseUpEventHandler += (sen, e) =>
            {
                btnPindaojia.IsSelected = false;
                KeyControl("ch_up", "频道+");
            };
            //频道-
            btnPindaojian.MouseDownEventHandler += (sen, e) => {
                btnPindaojian.IsSelected = true;
            btnPindaojian.MouseUpEventHandler += (sen, e) =>
            {
                btnPindaojian.IsSelected = false;
                KeyControl("ch_down", "频道-");
            };

@@ -372,8 +379,10 @@
                    action?.Invoke(IntType.Control);
                });
            }
            if (tyySingleFramLayout!=null) {
                tyySingleFramLayout.SetClickListener((f) => {
            if (tyySingleFramLayout != null)
            {
                tyySingleFramLayout.SetClickListener((f) =>
                {
                    action?.Invoke(IntType.Control);
                });
            }
@@ -394,7 +403,7 @@
                TextAlignment = TextAlignment.CenterLeft,
                TextColor = MusicColor.TextColor,
                TextSize = TextSize.Text16,
                Text= this.remoteControl.name,
                Text = this.remoteControl.name,
                IsBold = true,
            };
            this.AddChidren(btnTitle);
@@ -404,7 +413,7 @@
            {
                Y = btnTitle.Bottom + Application.GetRealHeight(16),
                Width = Application.GetRealWidth(240),
                Height = Application.GetRealHeight(1095-122),//遥控器固定高度
                Height = Application.GetRealHeight(1095 - 122 - 60),//遥控器固定高度
                Radius = (uint)Application.GetRealHeight(17),
                BackgroundColor = 0xff798394,
                Gravity = Gravity.CenterHorizontal,
@@ -417,7 +426,7 @@
                Y = btnTitle.Bottom + Application.GetRealHeight(16),
                //X = Application.GetRealWidth(71),
                Width = Application.GetRealWidth(232),
                Height = Application.GetRealHeight(1095-122),//遥控器固定高度
                Height = Application.GetRealHeight(1095 - 122 - 60),//遥控器固定高度
                Radius = (uint)Application.GetRealHeight(17),
                BackgroundColor = 0xff19181E,
                Gravity = Gravity.CenterHorizontal,
@@ -440,19 +449,23 @@

            switchBtn = new Button
            {
                Height = Application.GetRealWidth(32),
                Width = Application.GetRealWidth(32),
                Height = Application.GetRealWidth(48),
                Width = Application.GetRealWidth(48),
                Gravity = Gravity.Center,
                UnSelectedImagePath = "AksIcon/ykq_kai.png",
                SelectedImagePath= "AksIcon/ykq_kaiguang_selected.png"
                SelectedImagePath = "AksIcon/ykq_kaiguang_selected.png"
            };
            switchFl.AddChidren(switchBtn);
            switchBtn.MouseUpEventHandler += (senser, e) =>
            switchBtn.MouseDownEventHandler += (senser, e) =>
            {
                switchBtn.IsSelected = true;
            };
            switchBtn.MouseUpOutsideEventHandler += (senser, e) =>
            {
                switchBtn.IsSelected = false;
            };

            int h = 49-6;
            int h = 49 - 6;
            int offset = 28;//x轴偏移量
            int septal = 36;//间隔
            #region
@@ -748,7 +761,7 @@
            var baseFl = new BaseFramLayout
            {
                Y = line8Fl.Bottom,
                Height = Application.GetRealHeight(207-32-12),
                Height = Application.GetRealHeight(207 - 32 - 12),
            };
            layout.AddChidren(baseFl);

@@ -763,7 +776,12 @@
                SelectedImagePath = "AksIcon/ykq_yingliangjia_selected.png",
            };
            baseFl.AddChidren(btnYingliangjia);
            btnYingliangjia.MouseUpEventHandler += (sen,e) => {
            btnYingliangjia.MouseDownEventHandler += (sen, e) =>
            {
                btnYingliangjia.IsSelected = true;
            };
            btnYingliangjia.MouseUpOutsideEventHandler += (sen, e) =>
            {

                btnYingliangjia.IsSelected = false;
            };
@@ -779,14 +797,20 @@
                SelectedImagePath = "AksIcon/ykq_yingliangjian_selected.png",
            };
            baseFl.AddChidren(btnYingliangjian);
            btnYingliangjian.MouseUpEventHandler += (sen, e) => {
            btnYingliangjian.MouseDownEventHandler += (sen, e) =>
            {

                btnYingliangjian.IsSelected = true;
            };
            btnYingliangjian.MouseUpOutsideEventHandler += (sen, e) =>
            {

                btnYingliangjian.IsSelected = false;
            };



            btnPindaojia = new Button 
            btnPindaojia = new Button
            {
                Y = Application.GetRealHeight(16),
                X = Application.GetRealWidth(170),
@@ -796,7 +820,13 @@
                SelectedImagePath = "AksIcon/ykq_pindaojia_selected.png",
            };
            baseFl.AddChidren(btnPindaojia);
            btnPindaojia.MouseUpEventHandler += (sen, e) => {
            btnPindaojia.MouseDownEventHandler += (sen, e) =>
            {

                btnPindaojia.IsSelected = true;
            };
            btnPindaojia.MouseUpOutsideEventHandler += (sen, e) =>
            {

                btnPindaojia.IsSelected = false;
            };
@@ -812,7 +842,14 @@
                SelectedImagePath = "AksIcon/ykq_pindaojian_selected.png",
            };
            baseFl.AddChidren(btnPindaojian);
            btnPindaojian.MouseUpEventHandler += (sen, e) => {
            btnPindaojian.MouseDownEventHandler += (sen, e) =>
            {

                btnPindaojian.IsSelected = true;
            };

            btnPindaojian.MouseUpOutsideEventHandler += (sen, e) =>
            {

                btnPindaojian.IsSelected = false;
            };
@@ -880,27 +917,57 @@



            btnLeft.MouseUpEventHandler += (sender, e) =>


            btnLeft.MouseUpOutsideEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";

            };
            btnShang.MouseUpEventHandler += (sender, e) =>
            btnLeft.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_left_selected.png";

            };
            btnShang.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_shang_selected.png";


            };
            btnShang.MouseUpOutsideEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";

            };
            btnRight.MouseUpEventHandler += (sender, e) =>
            btnRight.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_right_selected.png";

            };
            btnRight.MouseUpOutsideEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";

            };
            btnXia.MouseUpEventHandler += (sender, e) =>

            btnXia.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_xia_selected.png";

            };

            btnXia.MouseUpOutsideEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";

            };
            btnOk.MouseUpEventHandler += (sender, e) =>
            btnOk.MouseDownEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok_selected.png";

            };
            btnOk.MouseUpOutsideEventHandler += (sender, e) =>
            {
                okFl.BackgroundImagePath = "AksIcon/ykq_ok.png";

@@ -1050,7 +1117,7 @@
            dengguanFL.AddTextButtonView();
            dengguanFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dengguan.png";
            dengguanFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dengguang_selected.png";
            dengguanFL.GetTextButton().Text = "灯关";
            dengguanFL.GetTextButton().Text = "灯光1";
            dengguanFL.AddClickView();


@@ -1073,7 +1140,7 @@
            dankongdengFL.AddTextButtonView();
            dankongdengFL.GetImageButton().UnSelectedImagePath = "AksIcon/ykq_dankongdeng.png";
            dankongdengFL.GetImageButton().SelectedImagePath = "AksIcon/ykq_dankongdeng_selected.png";
            dankongdengFL.GetTextButton().Text = "单控灯";
            dankongdengFL.GetTextButton().Text = "灯光2";
            dankongdengFL.AddClickView();

            #endregion
@@ -1109,11 +1176,11 @@

                if (tyySingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48))
                {
                    tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101  - 48) + tyySingleFramLayout.btnName.GetTextWidth();
                    tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101 - 48) + tyySingleFramLayout.btnName.GetTextWidth();
                    tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226 + 48) - tyySingleFramLayout.btnName.GetTextWidth();
                    tyySingleFramLayout.btnName.Width =tyySingleFramLayout.btnName.GetTextWidth();
                    tyySingleFramLayout.btnName.Width = tyySingleFramLayout.btnName.GetTextWidth();
                    tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                } 
                }

            }
            else
@@ -1122,7 +1189,7 @@
                typeMultiFramLayout = new TypeMultiFramLayout();
                typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
                typeMultiFramLayout.AddView(cornerBottomFram);
                typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
                typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
            }

            this.AdjustRealHeight(16);
@@ -1133,15 +1200,15 @@
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
     
        private void KeyControl(string keypad, string keyName,bool isSupport=true)

        private void KeyControl(string keypad, string keyName, bool isSupport = true)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName,isSupport);
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
                }
                catch { }
                finally
@@ -1163,7 +1230,7 @@
    class CustomFrameLayout : FrameLayout
    {
        public const int widthFrameLayout = 36;
        public const int heightFrameLayout = 49-6;
        public const int heightFrameLayout = 49 - 6;
        public CustomFrameLayout(int width = widthFrameLayout, int height = heightFrameLayout)
        {
            this.Width = Application.GetRealWidth(width);
@@ -1185,7 +1252,7 @@
            SelectedTextColor = MusicColor.MusicTxet14SelectedColor,
            TextAlignment = TextAlignment.Center,
            Gravity = Gravity.CenterHorizontal,
            Padding=new Padding(0,0,0,0),
            Padding = new Padding(0, 0, 0, 0),
        };
        Button btnNumber = new Button
        {
@@ -1204,7 +1271,7 @@
            Height = Application.GetRealWidth(12),
            Gravity = Gravity.Center,
            Radius = (uint)Application.GetRealWidth(6),
            BackgroundColor=0x00000000,
            BackgroundColor = 0x00000000,
            SelectedBackgroundColor = 0xFFF2F3F7,
        };

@@ -1273,7 +1340,7 @@
                btnNumber.IsSelected = true;
                btn.IsSelected = true;

                action?.Invoke();

            };

            clickFl.MouseUpEventHandler += (sender, e) =>
@@ -1283,6 +1350,16 @@
                btnText.IsSelected = false;
                btnNumber.IsSelected = false;
                btn.IsSelected = false;
                action?.Invoke();
            };

            clickFl.MouseUpOutsideEventHandler += (sender, e) =>
            {
                //this.BackgroundColor = 0x00000000;
                btnImage.IsSelected = false;
                btnText.IsSelected = false;
                btnNumber.IsSelected = false;
                btn.IsSelected = false;
            };

        }