2023年10月16日15:30:28

mac

2023-10-16 5868b389a3544cf14ff65e87b554c07349badd28

2023年10月16日15:30:28

优化没有时序器UI界面

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

@@ -192,7 +192,7 @@
                {
                    this.remoteControlList = SendMethod.Current.GetRemoteControlLits(this.device.deviceId);
                    this.sequencerList = SendMethod.Current.GetSequencerLits(this.device.deviceId);
                    TestData(this.remoteControlList);
                    //TestData(this.remoteControlList);
                }
                catch { }
                finally
@@ -334,6 +334,11 @@
            conditionView.SingleSelectionShow(this, deviceTypeList, "设备选择", ccurrnetDeviceStr
               , (index) =>
               {
                   if (this.indexValue == index)
                   {
                       //同一个设备不处理;
                       return;
                   }
                   var remoteControl = deviceTypeList[index];
                   this.indexValue = index;
                   this.currnetIntType = (IntType)remoteControl.type;

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

@@ -60,6 +60,9 @@
            }
            return bottomHeight;
        }



    }

 

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

@@ -27,7 +27,7 @@
        public FrameLayout singleFramLayout = new FrameLayout
        {
            BackgroundColor = MusicColor.ViewColor,
            Gravity = Gravity.CenterHorizontal,
            //Gravity = Gravity.CenterHorizontal,
            Width = Application.GetRealWidth(101),
            Height = Application.GetRealHeight(40),
            Radius = (uint)Application.GetRealHeight(20),

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

@@ -34,6 +34,7 @@
        public Action<IntType> action;
        CornerFramLayout cornerFram;
        TypeMultiFramLayout typeMultiFramLayout;
        TypeSingleFramLayout gfSingleFramLayout;

        public void Show()
        {
@@ -57,6 +58,18 @@
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };

            if (gfSingleFramLayout != null)
            {
                //设备切换
                gfSingleFramLayout.SetClickListener((f) =>
                {
                    action?.Invoke(IntType.HiFi);
                });
            }

            if (typeMultiFramLayout != null)
            {
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
@@ -71,6 +84,7 @@
            {
                action?.Invoke(IntType.HiFi);
            });
            }

        }

@@ -108,12 +122,47 @@
            cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
            this.AddChidren(cornerBottomFram);


            if (sequencerList.Count == 0)
            {
                //没有时序器
                gfSingleFramLayout = new TypeSingleFramLayout();
                gfSingleFramLayout.AddView(cornerBottomFram);
                gfSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
                gfSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
                gfSingleFramLayout.singleFramLayout.Gravity = Gravity.CenterVertical;
                gfSingleFramLayout.btnName.Text = this.remoteControl.name;
                gfSingleFramLayout.btnName.X = Application.GetRealWidth(16);
                gfSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
                gfSingleFramLayout.btnRightImage.X = gfSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                gfSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
                gfSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
                gfSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                gfSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                gfSingleFramLayout.btnLeftImage.Visible = false;

                if (gfSingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48))
                {
                    gfSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101 - 48) + gfSingleFramLayout.btnName.GetTextWidth();
                    gfSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226 + 48) - gfSingleFramLayout.btnName.GetTextWidth();
                    gfSingleFramLayout.btnName.Width = gfSingleFramLayout.btnName.GetTextWidth();
                    gfSingleFramLayout.btnRightImage.X = gfSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                }
            }
            else
            {
                //有时序器
            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Gravity = Gravity.Center;
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;

            }
            this.AdjustRealHeight(16);




        }

        /// <summary>

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

@@ -50,6 +50,8 @@
        /// </summary>
        TypeMultiFramLayout typeMultiFramLayout;

        TypeSingleFramLayout jdhSingleFramLayout; 


        public void Show()
        {
@@ -106,6 +108,18 @@
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });

            if (jdhSingleFramLayout != null)
            {

                //设备切换
                jdhSingleFramLayout.SetClickListener((f) =>
                {
                    action?.Invoke(IntType.STB);
                });
            }
            if (typeMultiFramLayout != null)
            {
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
@@ -118,9 +132,9 @@
            //设备切换
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.STB);
            });
            }

        }

@@ -270,10 +284,32 @@
            menuFram.Y = Application.GetRealHeight(24);
            menuFram.AddView(cornerBottomFram);

            if (sequencerList.Count == 0)
            {
                //没有时序器
                jdhSingleFramLayout = new TypeSingleFramLayout();
                jdhSingleFramLayout.AddView(cornerBottomFram);
                jdhSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                jdhSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
                jdhSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
                jdhSingleFramLayout.btnName.Text = this.remoteControl.name;
                jdhSingleFramLayout.btnName.X = Application.GetRealWidth(16);
                jdhSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
                jdhSingleFramLayout.btnRightImage.X = jdhSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                jdhSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
                jdhSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
                jdhSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                jdhSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                jdhSingleFramLayout.btnLeftImage.Visible = false;
            }
            else
            {

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

            //初始值
            leftBtnTitle.IsSelected = true;

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

@@ -33,7 +33,11 @@
        private RemoteControlEntity remoteControl;
        public Action<IntType> action;
        CornerFramLayout cornerFram;
        TypeSingleFramLayout typeSingleFramLayout;
        /// <summary>
        /// 影库
        /// </summary>
        TypeSingleFramLayout ykSingleFramLayout;
        TypeSingleFramLayout bfqSingleFramLayout;
        MenuFramLayout menuFram;
        TypeMultiFramLayout typeMultiFramLayout;

@@ -66,13 +70,6 @@
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };

            typeSingleFramLayout.SetClickListener((f) =>
            {
                YkPage ykPage = new YkPage(this.remoteControl);
                MainPage.BasePageView.AddChidren(ykPage);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                ykPage.Show();
            });

            menuFram.SetTopClickListener((keypadEntity) =>
            {
@@ -95,6 +92,27 @@
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });


            if (bfqSingleFramLayout != null)
            {
                bfqSingleFramLayout.SetClickListener((f) =>
                {
                    action?.Invoke(IntType.Player);
                });
            }
            if (ykSingleFramLayout != null)
            {
                ykSingleFramLayout.SetClickListener((f) =>
                {
                    YkPage ykPage = new YkPage(this.remoteControl);
                    MainPage.BasePageView.AddChidren(ykPage);
                    MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                    ykPage.Show();
                });
            }
            if (typeMultiFramLayout != null)
            {
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
                SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
@@ -107,6 +125,7 @@
            {
                action?.Invoke(IntType.Player);
            });
            }

        }

@@ -137,6 +156,50 @@
            cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(this.remoteControl), 4);


            if (sequencerList.Count == 0)
            {
                //没有时序器
                CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364 - 32-32-40, 17);
                this.AddChidren(cornerBottomFram);
                cornerBottomFram.X = Application.GetRealWidth(16);
                cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16);
                cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
                cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);

                //播放器
                bfqSingleFramLayout = new TypeSingleFramLayout();
                bfqSingleFramLayout.AddView(cornerBottomFram);
                bfqSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
                bfqSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(16);
                bfqSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
                bfqSingleFramLayout.btnName.Text = this.remoteControl.name;
                bfqSingleFramLayout.btnName.X= Application.GetRealWidth(16);
                bfqSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
                bfqSingleFramLayout.btnRightImage.X = bfqSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                bfqSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
                bfqSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
                bfqSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                bfqSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                bfqSingleFramLayout.btnLeftImage.Visible = false;




                //影库
                ykSingleFramLayout = new TypeSingleFramLayout();
                ykSingleFramLayout.AddView(cornerBottomFram);
                ykSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
                ykSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);

                menuFram = new MenuFramLayout();
                menuFram.AddView(cornerBottomFram);
                menuFram.Y = ykSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32);
                this.AdjustRealHeight(16);

            }
            else
            {
                //有时序器
            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364-32, 17);
            this.AddChidren(cornerBottomFram);
            cornerBottomFram.X = Application.GetRealWidth(16);
@@ -145,14 +208,16 @@
            cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);


            typeSingleFramLayout = new TypeSingleFramLayout();
            typeSingleFramLayout.AddView(cornerBottomFram);
            typeSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
                ykSingleFramLayout = new TypeSingleFramLayout();
                ykSingleFramLayout.AddView(cornerBottomFram);
                ykSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
                ykSingleFramLayout.singleFramLayout.Gravity = Gravity.CenterHorizontal;



            menuFram = new MenuFramLayout();
            menuFram.AddView(cornerBottomFram);
            menuFram.Y = typeSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32);
                menuFram.Y = ykSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32);


            typeMultiFramLayout = new TypeMultiFramLayout();
@@ -163,6 +228,7 @@

            this.AdjustRealHeight(16);
        }
        }

        /// <summary>
        /// 按键控制

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

@@ -47,13 +47,6 @@
        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()

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

@@ -49,6 +49,8 @@
        /// </summary>
        TypeMultiFramLayout typeMultiFramLayout;

        TypeSingleFramLayout tvSingleFramLayout;


        public void Show()
        {
@@ -111,6 +113,18 @@

                KeyControl(keypadEntity.keypad, keypadEntity.name);
            });

            if (tvSingleFramLayout != null)
            {
                //设备切换
                tvSingleFramLayout.SetClickListener((f) =>
                {
                    action?.Invoke(IntType.TV);
                });
            }

            if (typeMultiFramLayout != null)
            {
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
@@ -125,6 +139,7 @@
            {
                action?.Invoke(IntType.TV);
            });
            }

        }

@@ -274,10 +289,34 @@
            menuFram.Y = Application.GetRealHeight(24);
            menuFram.AddView(cornerBottomFram);


            if (sequencerList.Count == 0)
            {
                //没有时序器
                tvSingleFramLayout = new TypeSingleFramLayout();
                tvSingleFramLayout.AddView(cornerBottomFram);
                tvSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                tvSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
                tvSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
                tvSingleFramLayout.btnName.Text = this.remoteControl.name;
                tvSingleFramLayout.btnName.X = Application.GetRealWidth(16);
                tvSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
                tvSingleFramLayout.btnRightImage.X = tvSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                tvSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
                tvSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
                tvSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                tvSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                tvSingleFramLayout.btnLeftImage.Visible = false;
            }
            else
            {


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

            //初始值
            leftBtnTitle.IsSelected = true;

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

@@ -36,6 +36,8 @@
        MenuFramLayout menuFram;
        TypeMultiFramLayout typeMultiFramLayout;

        TypeSingleFramLayout tyySingleFramLayout;

        public void Show()
        {
            //初始化UI
@@ -94,6 +96,8 @@

                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            if (typeMultiFramLayout != null)
            {
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
@@ -108,6 +112,16 @@
            {
                action?.Invoke(IntType.Projector);
            });
            }
            if (tyySingleFramLayout != null)
            {
                //设备切换
                tyySingleFramLayout.SetClickListener((f) =>
                {
                    action?.Invoke(IntType.Projector);
                });
            }


        }
        
@@ -146,11 +160,31 @@
            menuFram = new MenuFramLayout();
            menuFram.Y = Application.GetRealHeight(24);
            menuFram.AddView(cornerBottomFram);

            if (sequencerList.Count == 0)
            {
                //没有时序器
                tyySingleFramLayout = new TypeSingleFramLayout();
                tyySingleFramLayout.AddView(cornerBottomFram);
                tyySingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
                tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
                tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
                tyySingleFramLayout.btnName.Text = this.remoteControl.name;
                tyySingleFramLayout.btnName.X = Application.GetRealWidth(16);
                tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48);
                tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
                tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
                tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                tyySingleFramLayout.btnLeftImage.Visible = false;
            }
            else
            {
            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
            }

            this.AdjustRealHeight(16);
        }

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

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

        Button switchBtn;
        CustomFrameLayout xinxiFL;
@@ -354,7 +355,8 @@

            });


            if (typeMultiFramLayout != null)
            {
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
@@ -367,9 +369,14 @@
            //设备切换
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.Control);
            });
            }
            if (tyySingleFramLayout!=null) {
                tyySingleFramLayout.SetClickListener((f) => {
                    action?.Invoke(IntType.Control);
                });
            }

        }
        /// <summary>
@@ -1081,10 +1088,42 @@
            cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
            this.AddChidren(cornerBottomFram);


            if (sequencerList.Count == 0)
            {
                //没有时序器
                tyySingleFramLayout = new TypeSingleFramLayout();
                tyySingleFramLayout.AddView(cornerBottomFram);
                tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
                tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
                tyySingleFramLayout.singleFramLayout.Gravity = Gravity.CenterVertical;
                tyySingleFramLayout.btnName.Text = this.remoteControl.name;
                tyySingleFramLayout.btnName.X = Application.GetRealWidth(16);
                tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48);
                tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
                tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
                tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
                tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
                tyySingleFramLayout.btnLeftImage.Visible = false;

                if (tyySingleFramLayout.btnName.GetTextWidth() > Application.GetRealWidth(48))
                {
                    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.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
                } 

            }
            else
            {

            typeMultiFramLayout = new TypeMultiFramLayout();
            typeMultiFramLayout.multiFramLayout.Y = Application.GetRealHeight(16);
            typeMultiFramLayout.AddView(cornerBottomFram);
            typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
            }

            this.AdjustRealHeight(16);
        }