2024年07月25日17:24:45

mac

2024-07-25 3f6685c77beeb12baf840733fb890860f4c26e7c

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

@@ -56,7 +56,7 @@
        {
            cornerFram.selectKeyAction += (keypadEntity) => 
            {
                this.KeyControl(keypadEntity.keypad, keypadEntity.name);
                this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
            };

            if (gfSingleFramLayout != null)
@@ -140,14 +140,11 @@
                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);
                }
                gfSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
                gfSingleFramLayout.singleFramLayout,
                gfSingleFramLayout.btnName,
                gfSingleFramLayout.btnRightImage,
                48, 200);
            }
            else
            {
@@ -155,7 +152,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);
@@ -170,14 +167,15 @@
        /// </summary>
        /// <param name="keypad"><按键标识/param>
        /// <param name="keyName"><按键名称(打印用的)/param>
        private void KeyControl(string keypad, string keyName)
        /// <param name="isSupport"><是否支持控制/param>
        private void KeyControl(string keypad, string keyName, bool isSupport)
        {
            //CommonMethod.Current.Loading.Start();
            CommonMethod.Current.SunThread(() =>
            {
                try
                {
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
                    SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName, isSupport);
                }
                catch { }
                finally