From b562a582ac3a288193e6e4f57c5eff8a344305a4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 13:52:17 +0800
Subject: [PATCH] Update AndroidManifest.xml
---
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index 2cc2a11..a635f30 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
@@ -76,37 +76,37 @@
//鍔熻兘閿帶鍒�
cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鏁板瓧閿帶鍒�
numberFrame.selectKeyAction += (keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鑿滃崟涓婃寜閿�
menuFram.SetTopClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟涓嬫寜閿�
menuFram.SetBottomClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟宸︽寜閿�
menuFram.SetLeftClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟鍙虫寜閿�
menuFram.SetRightClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟ok鎸夐敭
menuFram.SetOkClickListener((keypadEntity) =>
{
- this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
if (jdhSingleFramLayout != null)
@@ -301,6 +301,11 @@
jdhSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
jdhSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
jdhSingleFramLayout.btnLeftImage.Visible = false;
+ jdhSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+ jdhSingleFramLayout.singleFramLayout,
+ jdhSingleFramLayout.btnName,
+ jdhSingleFramLayout.btnRightImage,
+ 48, 200);
}
else
{
@@ -308,7 +313,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+ typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
}
//鍒濆鍊�
@@ -358,14 +363,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