From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
index 1af1e6a..11e01c8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/GfPage.cs
+++ b/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
--
Gitblit v1.8.0