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/TyyPage.cs | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 69 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
index 2933d1c..1f1afab 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TyyPage.cs
@@ -36,6 +36,8 @@
MenuFramLayout menuFram;
TypeMultiFramLayout typeMultiFramLayout;
+ TypeSingleFramLayout tyySingleFramLayout;
+
public void Show()
{
//鍒濆鍖朥I
@@ -62,55 +64,67 @@
//鍔熻兘閿帶鍒�
cornerTopFram.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);
});
- //鏃跺簭鍣�
- typeMultiFramLayout.SetLeftFlClickListener((f) =>
+ if (typeMultiFramLayout != null)
{
- SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
- MainPage.BasePageView.AddChidren(sxqPage);
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
- sxqPage.Show();
+ //鏃跺簭鍣�
+ 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) =>
+ });
+ //璁惧鍒囨崲
+ typeMultiFramLayout.SetRightFlClickListener((f) =>
+ {
+ action?.Invoke(IntType.Projector);
+ });
+ }
+ if (tyySingleFramLayout != null)
{
- action?.Invoke(IntType.Projector);
- });
+ //璁惧鍒囨崲
+ tyySingleFramLayout.SetClickListener((f) =>
+ {
+ action?.Invoke(IntType.Projector);
+ });
+ }
+
}
-
+
private void InitUI()
{
this.BackgroundColor = MusicColor.ViewColor;
@@ -123,20 +137,20 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- Text= this.remoteControl.name,
+ Text = this.remoteControl.name,
IsBold = true,
};
this.AddChidren(btnTitle);
- cornerTopFram = new CornerFramLayout(343, 452-30, 17);
+ cornerTopFram = new CornerFramLayout(343, 452 - 30, 17);
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
cornerTopFram.SetMargin(16, 0, 16, 0);
- cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 3, 4, 5 });
+ cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(this.remoteControl), new List<int> { 3, 4, 5 });
- CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292-30, 17);
+ CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 292 - 30, 17);
cornerBottomFram.X = Application.GetRealWidth(16);
cornerBottomFram.Y = cornerTopFram.Bottom + Application.GetRealHeight(16);
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
@@ -146,11 +160,37 @@
menuFram = new MenuFramLayout();
menuFram.Y = Application.GetRealHeight(24);
menuFram.AddView(cornerBottomFram);
+ if (sequencerList.Count == 0)
+ {
+ //娌℃湁鏃跺簭鍣�
+ tyySingleFramLayout = new TypeSingleFramLayout();
+ tyySingleFramLayout.AddView(cornerBottomFram);
+ tyySingleFramLayout.singleFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
+ tyySingleFramLayout.singleFramLayout.X = Application.GetRealWidth(226);
+ tyySingleFramLayout.singleFramLayout.Width = Application.GetRealWidth(101);
+ tyySingleFramLayout.btnName.Text = this.remoteControl.name;
+ tyySingleFramLayout.btnName.X = Application.GetRealWidth(16);
+ tyySingleFramLayout.btnName.Width = Application.GetRealWidth(48);
+ tyySingleFramLayout.btnRightImage.X = tyySingleFramLayout.btnName.Right + Application.GetRealWidth(8);
+ tyySingleFramLayout.btnRightImage.Width = Application.GetRealWidth(16);
+ tyySingleFramLayout.btnRightImage.Height = Application.GetRealWidth(16);
+ tyySingleFramLayout.btnRightImage.UnSelectedImagePath = "AksIcon/xuanze.png";
+ tyySingleFramLayout.btnRightImage.Gravity = Gravity.CenterVertical;
+ tyySingleFramLayout.btnLeftImage.Visible = false;
+ tyySingleFramLayout.CustomCalculationWidth(TypeSingleFramLayout.Orientation.right,
+ tyySingleFramLayout.singleFramLayout,
+ tyySingleFramLayout.btnName,
+ tyySingleFramLayout.btnRightImage,
+ 48,200);
- typeMultiFramLayout = new TypeMultiFramLayout();
- typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
- typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
+ }
+ else
+ {
+ typeMultiFramLayout = new TypeMultiFramLayout();
+ typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
+ typeMultiFramLayout.AddView(cornerBottomFram);
+ typeMultiFramLayout.btnRightName.Text = this.remoteControl.name;
+ }
this.AdjustRealHeight(16);
}
@@ -160,14 +200,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