From ff423b88a0dc521932305b5bd44b1786d3e42722 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 10 八月 2023 18:48:02 +0800
Subject: [PATCH] 2023年08月10日18:47:45
---
HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
index 074db3e..7d8ca90 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/JdhPage.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,11 +12,25 @@
/// </summary>
public class JdhPage:BaseFramLayout
{
- public JdhPage()
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="remoteControlEntity">閬ユ帶鍣ㄥ璞�</param>
+ /// <param name="sequencerList">鏃跺簭鍣ㄥ垪琛�</param>
+ public JdhPage(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>
/// 鏈�涓婇潰鍔熻兘閿鍣�
@@ -94,7 +109,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();
@@ -121,7 +136,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = MusicColor.TextColor,
TextSize = TextSize.Text16,
- TextID = StringId.dianshi,
+ TextID = StringId.jidinghe,
};
this.AddChidren(btnTitle);
@@ -129,9 +144,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
@@ -236,7 +250,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);
@@ -254,7 +268,7 @@
typeMultiFramLayout = new TypeMultiFramLayout();
typeMultiFramLayout.multiFramLayout.Y = menuFram.Bottom + Application.GetRealHeight(32);
typeMultiFramLayout.AddView(cornerBottomFram);
- typeMultiFramLayout.btnBottonRightName.TextID = StringId.dianshi;
+ typeMultiFramLayout.btnBottonRightName.TextID = StringId.shixuqi;
//鍒濆鍊�
leftBtnTitle.IsSelected = true;
--
Gitblit v1.8.0