From 38ee59a8404c1fa9385649f9690c8d671a5d95de Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 31 八月 2023 19:00:22 +0800
Subject: [PATCH] 2023年08月31日19:00:14

---
 HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs |   56 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Aks/AksPage.cs
index 3c9bb3f..40156ef 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,10 +235,10 @@
             {
                 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) =>
+                        musicPage.action += (deviceType) =>
                         {
                             SelectedType();
                         };
@@ -239,10 +246,10 @@
                     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) =>
+                        gfPage.action += (deviceType) =>
                         {
                             SelectedType();
                         };
@@ -252,10 +259,10 @@
                 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) =>
+                        tvPage.action += (deviceType) =>
                         {
                             SelectedType();
                         };
@@ -263,10 +270,10 @@
                     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) =>
+                        jdhPage.action += (deviceType) =>
                         {
                             SelectedType();
                         };
@@ -274,10 +281,10 @@
                     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) =>
+                        tyyPage.action += (deviceType) =>
                         {
                             SelectedType();
                         };
@@ -286,10 +293,10 @@
                 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) =>
+                        ykqPage.action += (deviceType) =>
                         {
                             SelectedType();
                         };
@@ -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