From e4ab7ba15864d2adb882646d8e09bd00effa4d1b Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 21 八月 2023 17:12:11 +0800
Subject: [PATCH] 2023年08月21日17:12:02
---
HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs | 44 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
index 3c9bb3f..5e38d48 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
@@ -23,6 +23,10 @@
/// 閬ユ帶鍣ㄥ垪琛�
/// </summary>
private List<RemoteControlEntity> remoteControlList;
+
+ /// 鏃跺簭鍣ㄥ垪琛�
+ /// </summary>
+ private List<SequencerEntity> sequencerList;
/// <summary>
/// 璁惧
/// </summary>
@@ -131,6 +135,8 @@
//杩斿洖
this.topView.clickBackBtn.MouseUpEventHandler += (sender, e) =>
{
+ //娓呯┖鎵�鏈夌紦瀛樻暟鎹�
+ AksCommonMethod.Current.ClearData();
this.RemoveFromParent();
};
//璁剧疆
@@ -179,6 +185,7 @@
try
{
this.remoteControlList = SendMethod.Current.GetRemoteControlLits(this.device.deviceId);
+ this.sequencerList = SendMethod.Current.GetSequencerLits(this.device.deviceId);
}
catch { }
finally
@@ -228,7 +235,7 @@
{
case IntType.Player:
{
- MusicPage musicPage = new MusicPage();
+ MusicPage musicPage = new MusicPage(GetRemoteControl((int)IntType.Player),this.sequencerList);
this.vv.AddChidren(musicPage);
musicPage.Show();
musicPage.action += (type) =>
@@ -239,7 +246,7 @@
break;
case IntType.HiFi:
{
- GfPage gfPage = new GfPage();
+ GfPage gfPage = new GfPage(GetRemoteControl((int)IntType.HiFi), this.sequencerList);
this.vv.AddChidren(gfPage);
gfPage.Show();
gfPage.action += (type) =>
@@ -252,7 +259,7 @@
case IntType.TV:
{
- TvPage tvPage = new TvPage();
+ TvPage tvPage = new TvPage(GetRemoteControl((int)IntType.TV), this.sequencerList);
this.vv.AddChidren(tvPage);
tvPage.Show();
tvPage.action += (type) =>
@@ -263,7 +270,7 @@
break;
case IntType.STB:
{
- JdhPage jdhPage = new JdhPage();
+ JdhPage jdhPage = new JdhPage(GetRemoteControl((int)IntType.STB), this.sequencerList);
this.vv.AddChidren(jdhPage);
jdhPage.Show();
jdhPage.action += (type) =>
@@ -274,7 +281,7 @@
break;
case IntType.Projector:
{
- TyyPage tyyPage = new TyyPage();
+ TyyPage tyyPage = new TyyPage(GetRemoteControl((int)IntType.Projector), this.sequencerList);
this.vv.AddChidren(tyyPage);
tyyPage.Show();
tyyPage.action += (type) =>
@@ -286,7 +293,7 @@
case IntType.Control:
{
- YkqPage ykqPage = new YkqPage();
+ YkqPage ykqPage = new YkqPage(GetRemoteControl((int)IntType.Control), this.sequencerList);
this.vv.AddChidren(ykqPage);
ykqPage.Show();
ykqPage.action += (type) =>
@@ -318,6 +325,27 @@
});
}
+
+ /// <summary>
+ /// 鏌ユ壘閬ユ帶鍣�
+ /// </summary>
+ /// <param name="type">(1 = 鎾斁鍣�,2 = 鍔熸斁,3 = 鐢佃,4 = 鏈洪《鐩�,5 = 鎶曞奖浠�,6 = 涓囪兘閬ユ帶鍣�)</param>
+ /// <returns>涓嶄細涓簄ull</returns>
+ private RemoteControlEntity GetRemoteControl(int type)
+ {
+ if (this.remoteControlList == null || this.remoteControlList.Count == 0)
+ {
+ return new RemoteControlEntity();
+ }
+ var re = this.remoteControlList.Find((o) => o.type == type);
+ if (re == null)
+ {
+ re = new RemoteControlEntity();
+ }
+ //re.deviceId = this.device.deviceId;
+ return re;
+ }
+
public enum IntType
{
@@ -436,5 +464,9 @@
return "";
}
+
+
+
+
}
}
--
Gitblit v1.8.0