From 049d6807b7cbf9a338da659a556d137915a0bf15 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 八月 2023 09:22:37 +0800
Subject: [PATCH] 2023年08月29日09:22:35
---
HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
index 316ad5b..8a43e9c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/TvPage.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using HDL_ON.UI.Music;
using HDL_ON.UI.UI2.FuntionControlView.Aks.CommonView;
+using HDL_ON.UI.UI2.FuntionControlView.Aks.Entity;
using Shared;
using static HDL_ON.UI.UI2.FuntionControlView.Aks.AksPage;
namespace HDL_ON.UI.UI2.FuntionControlView.Aks
@@ -11,9 +12,24 @@
/// </summary>
public class TvPage : BaseFramLayout
{
- public TvPage()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
+ /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
+ public TvPage(RemoteControlEntity remoteControlEntity, List<SequencerEntity> sequencerList)
{
+ this.remoteControl = remoteControlEntity;
+ this.sequencerList = sequencerList;
}
+ /// <summary>
+ /// 鏃跺簭鍣ㄥ垪琛�
+ /// </summary>
+ private List<SequencerEntity> sequencerList;
+ /// <summary>
+ /// 褰撳墠鐨勯仴鎺у櫒瀵硅薄
+ /// </summary>
+ private RemoteControlEntity remoteControl;
public Action<IntType> action;
/// <summary>
/// 鏈�涓婇潰鍔熻兘閿鍣�
@@ -54,12 +70,12 @@
private void EventListener()
{
//鍔熻兘閿帶鍒�
- cornerTopFram.selectAction += (value) =>
+ cornerTopFram.selectKeyAction += (value) =>
{
Console.WriteLine("1");
};
//鏁板瓧閿帶鍒�
- numberFrame.selectAction += (s) =>
+ numberFrame.selectKeyAction += (s) =>
{
Console.WriteLine("鎵撳嵃====" + s);
};
@@ -92,7 +108,7 @@
//鏃跺簭鍣�
typeMultiFramLayout.SetLeftFlClickListener((f) =>
{
- SxqPage sxqPage = new SxqPage();
+ SxqPage sxqPage = new SxqPage(this.sequencerList,this.remoteControl.deviceId);
MainPage.BasePageView.AddChidren(sxqPage);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
sxqPage.Show();
@@ -127,9 +143,8 @@
cornerTopFram.X = Application.GetRealWidth(16);
cornerTopFram.Y = btnTitle.Bottom + Application.GetRealHeight(16);
this.AddChidren(cornerTopFram);
- cornerTopFram.SetList(cornerTopFram.GetTestList(17));
cornerTopFram.SetMargin(16, 0, 16, 0);
- cornerTopFram.LoadButtonPage(new List<int> { 5, 6 });
+ cornerTopFram.LoadButtonPage(AksCommonMethod.Current.GetTYYKeypadList(),new List<int> { 5, 6 });
#region ----棰戦亾 鎺у埗----
FrameLayout middLayout = new FrameLayout
@@ -234,7 +249,7 @@
numberFrame.Y = middLayout.Bottom + Application.GetRealHeight(16);
numberFrame.BackgroundColor = MusicColor.WhiteColor;
numberFrame.SetMargin(16,0,16,0);
- numberFrame.LoadNumberButtonPage();
+ numberFrame.LoadNumberButtonPage(AksCommonMethod.Current.GetNumberKeypadList());
this.AddChidren(numberFrame);
--
Gitblit v1.8.0