Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc

mac

2023-08-29 2d5cd35af7437ad4015d38594d8c721dc6166b11

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

@@ -3,6 +3,7 @@
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
@@ -59,36 +60,39 @@


            //功能键控制
            cornerTopFram.selectKeyAction += (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) =>
@@ -102,12 +106,11 @@
            //设备切换
            typeMultiFramLayout.SetRightFlClickListener((f) =>
            {
                Console.WriteLine("4");
                action?.Invoke(IntType.Projector);
            });

        }

        
        private void InitUI()
        {
            this.BackgroundColor = MusicColor.ViewColor;
@@ -150,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();
                    });
                }
            });

        }
    }
}