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/MusicPage.cs | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
index 2aee513..668d031 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/MusicPage.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,12 +12,24 @@
/// </summary>
public class MusicPage : BaseFramLayout
{
- public MusicPage()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
+ /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
+ public MusicPage(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;
CornerFramLayout cornerFram;
TypeSingleFramLayout typeSingleFramLayout;
@@ -41,14 +54,14 @@
private void EventListener()
{
- cornerFram.selectAction += (value) =>
+ cornerFram.selectKeyAction += (value) =>
{
Console.WriteLine("1");
};
typeSingleFramLayout.SetClickListener((f) =>
{
- YkPage ykPage = new YkPage();
+ YkPage ykPage = new YkPage(this.remoteControl);
MainPage.BasePageView.AddChidren(ykPage);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
ykPage.Show();
@@ -78,7 +91,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();
@@ -105,37 +118,42 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.bofangqi,
+ //TextID = StringId.bofangqi,
+ Text = this.remoteControl.name,
};
this.AddChidren(btnTitle);
cornerFram = new CornerFramLayout(343, 452, 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);
+ cornerFram.LoadButtonPage(AksCommonMethod.Current.GetMusicKeypadList(), 4);
CornerFramLayout cornerBottomFram = new CornerFramLayout(343, 364, 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.btnBottonRightName.TextID = StringId.bofangqi;
+ typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
+ //typeMultiFramLayout.btnBottonRightName.TextID = StringId.bofangqi;
+ typeMultiFramLayout.btnBottonRightName.Text = this.remoteControl.name;
this.AdjustRealHeight(16);
}
--
Gitblit v1.8.0