From e2a009ca812c2f933e195c4276b79c34ed31862a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期五, 17 十二月 2021 18:29:10 +0800
Subject: [PATCH] 2021-12-17-01

---
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index 3db0642..572d534 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -70,7 +70,7 @@
             areaText.lineBtn.BackgroundColor = MusicColor.WhiteColor;
             areaText.textBtn.X = Application.GetRealWidth(16);
             areaText.textBtn.TextID = StringId.region;
-            areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
+            areaText.inputTextBtn.Text = A31MusicModel.Current.functionMusic.GetRoomListName();
 
             #endregion
 
@@ -122,17 +122,23 @@
             selectedSourceView.nextLevelBtn.Visible = false;
             selectedSourceView.FrameLayoutView(fL3, false);
 
+            View.MusicSourceView musicSourceView = new View.MusicSourceView();
+            musicSourceView.fLayout.Y = selectedSourceView.fLayout.Bottom;
+            musicSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/usb.png";
+            musicSourceView.textBtn.TextID = StringId.usb;
+            musicSourceView.FrameLayoutView(fL3);
+
             View.MusicSourceView localMusicSourceView = new View.MusicSourceView();
-            localMusicSourceView.fLayout.Y = selectedSourceView.fLayout.Bottom;
+            localMusicSourceView.fLayout.Y = musicSourceView.fLayout.Bottom;
             localMusicSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/localMusic.png";
             localMusicSourceView.textBtn.TextID = StringId.localMusic;
-            localMusicSourceView.FrameLayoutView(fL3);
+            //localMusicSourceView.FrameLayoutView(fL3);
 
             View.MusicSourceView usbSourceView = new View.MusicSourceView();
             usbSourceView.fLayout.Y = localMusicSourceView.fLayout.Bottom;
             usbSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/usb.png";
             usbSourceView.textBtn.TextID = StringId.usb;
-            usbSourceView.FrameLayoutView(fL3);
+            //usbSourceView.FrameLayoutView(fL3);
 
             View.MusicSourceView radioSourceView = new View.MusicSourceView();
             radioSourceView.fLayout.Y = usbSourceView.fLayout.Bottom;
@@ -144,19 +150,19 @@
             qqMusicSourceView.fLayout.Y = usbSourceView.fLayout.Bottom;
             qqMusicSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/qqMusic.png";
             qqMusicSourceView.textBtn.TextID = StringId.qqMusic;
-            qqMusicSourceView.FrameLayoutView(fL3);
+            //qqMusicSourceView.FrameLayoutView(fL3);
 
             View.MusicSourceView bluetoothSourceView = new View.MusicSourceView();
             bluetoothSourceView.fLayout.Y = qqMusicSourceView.fLayout.Bottom;
             bluetoothSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/bluetooth.png";
             bluetoothSourceView.textBtn.TextID = StringId.bluetooth;
-            bluetoothSourceView.FrameLayoutView(fL3);
+            //bluetoothSourceView.FrameLayoutView(fL3);
 
             View.MusicSourceView lineSourceView = new View.MusicSourceView();
             lineSourceView.fLayout.Y = bluetoothSourceView.fLayout.Bottom;
             lineSourceView.iconBtn.UnSelectedImagePath = "MusicIcon/line.png";
             lineSourceView.textBtn.TextID = StringId.line;
-            lineSourceView.FrameLayoutView(fL3);
+            //lineSourceView.FrameLayoutView(fL3);
 
 
             #endregion
@@ -164,6 +170,41 @@
             #endregion
 
             #region  鎵�鏈夌偣鍑讳簨浠�
+            ///浜嬩欢
+            musicSourceView.clickBtn.MouseUpEventHandler += (sender, e) =>
+            {
+                A31MusicFileList a31MusicFileList = new A31MusicFileList();
+                MainPage.BasePageView.AddChidren(a31MusicFileList);
+                a31MusicFileList.Show();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                Loading loading = new Loading();
+                a31MusicFileList.AddChidren(loading);
+                loading.Start();
+                System.Threading.Tasks.Task.Run(() =>
+                {
+                    try
+                    {
+                        if (A31MusicModel.Current.palyListInfos.Count == 0)
+                        {
+                           SendMethod.sendMethod.GetPalyList(A31MusicModel.Current.functionMusic);
+                           
+                        }
+                    }
+                    catch
+                    {
+                    }
+                    finally
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            loading.Hide();
+                            a31MusicFileList.FileView();
+                        });
+                    }
+                });
+            };
+
+
             ///鎾斁鍣ㄤ慨鏀瑰悕绉颁簨浠�
             playNameView.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
@@ -189,9 +230,9 @@
             ///鍖哄煙淇敼鐨勪簨浠�
             areaText.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
-                ChooseRoomPage chooseRoomPage = new ChooseRoomPage(A31MusicModel.Current, () =>
+                ChooseRoomPage chooseRoomPage = new ChooseRoomPage(A31MusicModel.Current.functionMusic, () =>
                 {
-                    areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
+                    areaText.inputTextBtn.Text = A31MusicModel.Current.functionMusic.GetRoomListName();
                     A31MusicModel.Save();
                 });
                 MainPage.BasePageView.AddChidren(chooseRoomPage);

--
Gitblit v1.8.0