From a499dceb02f181e64956431ed0c682dd7d2ce7d7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 04 八月 2020 17:45:20 +0800
Subject: [PATCH] 2020-08-04-1

---
 HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
index e521548..01344a2 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MusicSourcePage.cs
@@ -15,7 +15,7 @@
         public void Show()
         {
             #region   鐣岄潰甯冨眬------
-            this.BackgroundColor = Color.ViewColor;
+            this.BackgroundColor = MusicColor.ViewColor;
             var topView = new TopView();
             this.AddChidren(topView.TopFLayoutView());
             topView.topNameBtn.TextID = StringId.set;
@@ -41,7 +41,7 @@
             View.MusicSourceView musicIfonView = new View.MusicSourceView();
             musicIfonView.fLayout.Height = Application.GetRealHeight(44);
             musicIfonView.textBtn.TextID = StringId.information;
-            musicIfonView.textBtn.TextColor = Color.SelectedColor;
+            musicIfonView.textBtn.TextColor = MusicColor.SelectedColor;
             musicIfonView.textBtn.TextSize = TextSize.Text16;
             musicIfonView.inputTextBtn.Visible = false;
             musicIfonView.nextLevelBtn.Visible = false;
@@ -67,13 +67,12 @@
             areaText.nextLevelBtn.Width = Application.GetMinRealAverage(16);
             areaText.nextLevelBtn.Height = Application.GetMinRealAverage(16);
             areaText.nextLevelBtn.UnSelectedImagePath = "MusicIcon/sourceNetx.png";
-            areaText.lineBtn.BackgroundColor = Color.WhiteColor;
+            areaText.lineBtn.BackgroundColor = MusicColor.WhiteColor;
             areaText.textBtn.X = Application.GetRealWidth(16);
             areaText.textBtn.TextID = StringId.region;
             areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
 
             #endregion
-
 
             #region 姝屽崟锛堟垜鐨勬渶鐖� 鎴戠殑鍒楄〃锛�
             FrameLayout fL2 = new FrameLayout
@@ -86,7 +85,7 @@
             View.MusicSourceView playListView = new View.MusicSourceView();
             playListView.fLayout.Height = Application.GetRealHeight(44);
             playListView.textBtn.TextID = StringId.playList;
-            playListView.textBtn.TextColor = Color.SelectedColor;
+            playListView.textBtn.TextColor = MusicColor.SelectedColor;
             playListView.textBtn.TextSize = TextSize.Text16;
             playListView.inputTextBtn.Visible = false;
             playListView.nextLevelBtn.Visible = false;
@@ -117,7 +116,7 @@
             View.MusicSourceView selectedSourceView = new View.MusicSourceView();
             selectedSourceView.fLayout.Height = Application.GetRealHeight(44);
             selectedSourceView.textBtn.TextID = StringId.selectedSource;
-            selectedSourceView.textBtn.TextColor = Color.SelectedColor;
+            selectedSourceView.textBtn.TextColor = MusicColor.SelectedColor;
             selectedSourceView.textBtn.TextSize = TextSize.Text16;
             selectedSourceView.inputTextBtn.Visible = false;
             selectedSourceView.nextLevelBtn.Visible = false;
@@ -190,15 +189,14 @@
             ///鍖哄煙淇敼鐨勪簨浠�
             areaText.clickBtn.MouseUpEventHandler += (sender, e) =>
             {
-                ///鏆傛椂闅愯棌
-                //ChooseRoomPage chooseRoomPage = new ChooseRoomPage(A31MusicModel.Current, () =>
-                //{
-                //    areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
-                //});
-                //MainPage.BasePageView.AddChidren(chooseRoomPage);
-                //chooseRoomPage.LoadPage();
-                //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
+                ChooseRoomPage chooseRoomPage = new ChooseRoomPage(A31MusicModel.Current, () =>
+                {
+                    areaText.inputTextBtn.Text = A31MusicModel.Current.GetRoomListName();
+                    A31MusicModel.Save();
+                });
+                MainPage.BasePageView.AddChidren(chooseRoomPage);
+                chooseRoomPage.LoadPage();
+                MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
             ///鎴戠殑鍠滅埍浜嬩欢
             myLoveView.clickBtn.MouseUpEventHandler += (sender, e) =>

--
Gitblit v1.8.0