Merge branch 'wxr-2.0' into Dev-Branch

wxr

2023-09-06 fdbcb1f7463cb766f90bd29dd715485ba9d88524

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

@@ -2,6 +2,8 @@
using System.Collections.Generic;
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -11,9 +13,24 @@
    /// </summary>
    public class TyyPage : BaseFramLayout
    {
        public TyyPage()
        /// <summary>
        /// 
        /// </summary>
        /// <param name="remoteControlEntity">遥控器对象</param>
        /// <param name="sequencerList">时序器列表</param>
        public TyyPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
        {
            this.remoteControl = remoteControlEntity;
            this.sequencerList = sequencerList;
        }
        /// <summary>
        /// 时序器列表
        /// </summary>
        private List<SequencerEntity> sequencerList;
        /// <summary>
        /// 当前的遥控器对象
        /// </summary>
        private RemoteControlEntity remoteControl;
        public Action<IntType> action;
        CornerFramLayout cornerTopFram;
        MenuFramLayout menuFram;
@@ -43,41 +60,44 @@


            //功能键控制
            cornerTopFram.selectAction += (value) =>
            cornerTopFram.selectKeyAction += (keypadEntity) =>
            {
                Console.WriteLine("1");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            };

            //菜单上按键
            menuFram.SetTopClickListener((b) =>
            menuFram.SetTopClickListener((keypadEntity) =>
            {

                Console.WriteLine("5");
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单下按键
            menuFram.SetBottomClickListener((b) =>
            menuFram.SetBottomClickListener((keypadEntity) =>
            {
                Console.WriteLine("6");

                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单左按键
            menuFram.SetLeftClickListener((b) =>
            menuFram.SetLeftClickListener((keypadEntity) =>
            {
                Console.WriteLine("7");

                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单右按键
            menuFram.SetRightClickListener((b) =>
            menuFram.SetRightClickListener((keypadEntity) =>
            {
                Console.WriteLine("8");

                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //菜单ok按键
            menuFram.SetOkClickListener((b) =>
            menuFram.SetOkClickListener((keypadEntity) =>
            {
                Console.WriteLine("9");

                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
            });
            //时序器
            typeMultiFramLayout.SetLeftFlClickListener((f) =>
            {
                SxqPage sxqPage = new SxqPage();
                SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
                MainPage.BasePageView.AddChidren(sxqPage);
                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
                sxqPage.Show();
@@ -86,12 +106,11 @@
            //设备切换
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.Projector);
            });

        }

        
        private void InitUI()
        {
            this.BackgroundColor = MusicColor.ViewColor;
@@ -112,9 +131,8 @@
            cornerTopFram.X = Application.GetRealWidth(16);
            cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
            this.AddChidren(cornerTopFram);
            cornerTopFram.SetList(cornerTopFram.GetTestList(17));
            cornerTopFram.SetMargin(16, 0, 16, 0);
            cornerTopFram.LoadButtonPage(new List<int> { 3, 4, 5 });
            cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 3, 4, 5 });


            CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292, 17);
@@ -135,5 +153,31 @@

            this.AdjustRealHeight(16);
        }

        /// <summary>
        /// 按键控制
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                }
                catch { }
                finally
                {
                    CommonMethod.Current.MainThread(() =>
                    {
                        //CommonMethod.Current.Loading.Hide();
                    });
                }
            });

        }
    }
}