From 46a177eb1acf7ce91af7fe9ff57af87228de938d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 17 十月 2023 10:03:24 +0800
Subject: [PATCH] IOS库更新
---
HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs | 89 ++++++++++++++++++++++++++++++--------------
1 files changed, 61 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index a4de234..7c4db8f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
@@ -3,6 +3,7 @@
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
+using HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -54,9 +55,15 @@
private void EventListener()
{
- cornerFram.selectAction += (value) =>
+
+ cornerFram.selectKeyAction += (keypadEntity) =>
{
- Console.WriteLine("1");
+
+ if (keypadEntity == null)
+ {
+ return;
+ }
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
};
typeSingleFramLayout.SetClickListener((f) =>
@@ -67,28 +74,27 @@
ykPage.Show();
});
- menuFram.SetTopClickListener((b) =>
+ menuFram.SetTopClickListener((keypadEntity) =>
{
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ });
+ menuFram.SetBottomClickListener((keypadEntity) =>
+ {
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ });
+ menuFram.SetLeftClickListener((keypadEntity) =>
+ {
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
+ });
+ menuFram.SetRightClickListener((keypadEntity) =>
+ {
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
- Console.WriteLine("5");
});
- menuFram.SetBottomClickListener((b) =>
+ menuFram.SetOkClickListener((keypadEntity) =>
{
- Console.WriteLine("6");
+ this.KeyControl(keypadEntity.keypad, keypadEntity.name);
});
- menuFram.SetLeftClickListener((b) =>
- {
- Console.WriteLine("7");
- });
- menuFram.SetRightClickListener((b) =>
- {
- Console.WriteLine("8");
- });
- menuFram.SetOkClickListener((b) =>
- {
- Console.WriteLine("9");
- });
-
typeMultiFramLayout.SetLeftFlClickListener((f) =>
{
SxqPage sxqPage = new SxqPage(this.sequencerList, this.remoteControl.deviceId);
@@ -97,10 +103,8 @@
sxqPage.Show();
});
-
typeMultiFramLayout.SetRightFlClickListener((f) =>
{
- Console.WriteLine("4");
action?.Invoke(IntType.Player);
});
@@ -120,42 +124,71 @@
TextSize = TextSize.Text16,
//TextID = StringId.bofangqi,
Text = this.remoteControl.name,
+ Padding = new Padding(0, 0, 0, 0),
+ IsBold =true,
};
this.AddChidren(btnTitle);
- cornerFram = new CornerFramLayout(343, 452, 17);
+ cornerFram = new CornerFramLayout(343, 452-30, 17);
+ this.AddChidren(cornerFram);
cornerFram.X = Application.GetRealWidth(16);
cornerFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
- this.AddChidren(cornerFram);
cornerFram.SetMargin(16, 0, 16, 0);
cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(), 4);
- CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364, 17);
+ CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364-32, 17);
+ this.AddChidren(cornerBottomFram);
cornerBottomFram.X = Application.GetRealWidth(16);
cornerBottomFram.Y = cornerFram.Bottom + Application.GetRealHeight(16);
cornerBottomFram.BackgroundColor = MusicColor.WhiteColor;
cornerBottomFram.Radius = (uint)Application.GetRealHeight(17);
- this.AddChidren(cornerBottomFram);
+
typeSingleFramLayout = new TypeSingleFramLayout();
- typeSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
typeSingleFramLayout.AddView(cornerBottomFram);
+ typeSingleFramLayout.singleFramLayout.Y = Application.GetRealHeight(24);
+
menuFram = new MenuFramLayout();
- menuFram.Y = typeSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32);
menuFram.AddView(cornerBottomFram);
+ menuFram.Y = typeSingleFramLayout.singleFramLayout.Bottom + Application.GetRealHeight(32);
+
typeMultiFramLayout = new TypeMultiFramLayout();
- typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
+ typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
//typeMultiFramLayout.btnBottonRightName.TextID = StringId.bofangqi;
typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
this.AdjustRealHeight(16);
}
+ /// <summary>
+ /// 鎸夐敭鎺у埗
+ /// </summary>
+ /// <param name="keypad"><鎸夐敭鏍囪瘑/param>
+ /// <param name="keyName"><鎸夐敭鍚嶇О(鎵撳嵃鐢ㄧ殑)/param>
+ private void KeyControl(string keypad, string keyName)
+ {
+ //CommonMethod.Current.Loading.Start();
+ CommonMethod.Current.SunThread(() =>
+ {
+ try
+ {
+ SendMethod.Current.KeypadExecute(remoteControl.deviceId, remoteControl.rcId, keypad, keyName);
+ }
+ catch { }
+ finally
+ {
+ CommonMethod.Current.MainThread(() =>
+ {
+ //CommonMethod.Current.Loading.Hide();
+ });
+ }
+ });
+ }
}
}
--
Gitblit v1.8.0