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/TvPage.cs | 95 +++++++++++++++++++++++++++++++++++------------
1 files changed, 70 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 566d607..0cd10f0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -49,6 +49,8 @@
/// </summary>
TypeMultiFramLayout typeMultiFramLayout;
+ TypeSingleFramLayout tvSingleFramLayout;
+
public void Show()
{
@@ -73,58 +75,71 @@
//鍔熻兘閿帶鍒�
cornerTopFram.selectKeyAction += (keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鏁板瓧閿帶鍒�
numberFrame.selectKeyAction += (keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
};
//鑿滃崟涓婃寜閿�
menuFram.SetTopClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟涓嬫寜閿�
menuFram.SetBottomClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟宸︽寜閿�
menuFram.SetLeftClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟鍙虫寜閿�
menuFram.SetRightClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
//鑿滃崟ok鎸夐敭
menuFram.SetOkClickListener((keypadEntity) =>
{
- KeyControl(keypadEntity.keypad, keypadEntity.name);
+ KeyControl(keypadEntity.keypad, keypadEntity.name, keypadEntity.isClicked);
});
- //鏃跺簭鍣�
- typeMultiFramLayout.SetLeftFlClickListener((f) =>
- {
- SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
- MainPage.BasePageView.AddChidren(sxqPage);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- sxqPage.Show();
- });
- //璁惧鍒囨崲
- typeMultiFramLayout.SetRightFlClickListener((f) =>
+ if (tvSingleFramLayout != null)
{
- action?.Invoke(IntType.TV);
- });
+ //璁惧鍒囨崲
+ tvSingleFramLayout.SetClickListener((f) =>
+ {
+ action?.Invoke(IntType.TV);
+ });
+ }
+
+ if (typeMultiFramLayout != null)
+ {
+ //鏃跺簭鍣�
+ typeMultiFramLayout.SetLeftFlClickListener((f) =>
+ {
+ SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
+ MainPage.BasePageView.AddChidren(sxqPage);
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ sxqPage.Show();
+
+ });
+ //璁惧鍒囨崲
+ typeMultiFramLayout.SetRightFlClickListener((f) =>
+ {
+ action?.Invoke(IntType.TV);
+ });
+ }
}
@@ -274,10 +289,39 @@
menuFram.Y = Application.GetRealHeight(24);
menuFram.AddView(cornerBottomFram);
- typeMultiFramLayout = new TypeMultiFramLayout();
- typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
- typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+
+ if (sequencerList.Count == 0)
+ {
+ //娌℃湁鏃跺簭鍣�
+ tvSingleFramLayout = new TypeSingleFramLayout();
+ tvSingleFramLayout.AddView(cornerBottomFram);
+ tvSingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
+ tvSingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
+ tvSingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
+ tvSingleFramLayout.btnName.Text = this.remoteControl.name;
+ tvSingleFramLayout.btnName.X = Application.GetRealWidth(16);
+ tvSingleFramLayout.btnName.Width = Application.GetRealWidth(48);
+ tvSingleFramLayout.btnRightImage.X = tvSingleFramLayout.btnName.Right + Application.GetRealWidth(8);
+ tvSingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
+ tvSingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
+ tvSingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
+ tvSingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
+ tvSingleFramLayout.btnLeftImage.Visible = false;
+ tvSingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+ tvSingleFramLayout.singleFramLayout,
+ tvSingleFramLayout.btnName,
+ tvSingleFramLayout.btnRightImage,
+ 48, 200);
+ }
+ else
+ {
+
+
+ typeMultiFramLayout = new TypeMultiFramLayout();
+ typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
+ typeMultiFramLayout.AddView(cornerBottomFram);
+ typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
+ }
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
@@ -327,14 +371,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