From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1

---
 HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index c0e03d9..8bc0bf6 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -639,6 +639,14 @@
                         break;
                     case ShowFunction.Music:
                         btnName.TextID = StringId.Music;
+                        btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+                        {
+                            var musicMain = new HDL_ON.UI.Music.MusicMain();
+                            MainPage.BasePageView.AddChidren(musicMain);
+                            musicMain.Show();
+                            MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+                        };
+
                         break;
                     case ShowFunction.Panel:
                         btnName.TextID = StringId.Panel;
@@ -711,7 +719,10 @@
 
                 List<string> chooseList = new List<string>();
                 chooseList.Add(Language.StringByID(StringId.All));
-                chooseList.AddRange(DB_ResidenceData.residenceData.floors);
+                foreach (var f in DB_ResidenceData.residenceData.floors)
+                {
+                    chooseList.Add(f.name);
+                }
 
                 foreach (var floor in chooseList)
                 {

--
Gitblit v1.8.0