From 23c075a9c27946773feccf05abc90489a6bf5203 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 06 七月 2020 15:58:53 +0800 Subject: [PATCH] 20200706 --- HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs index c0e03d9..92044e1 100644 --- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs @@ -117,7 +117,7 @@ contentPageView = new PageLayout() { Y = Application.GetRealHeight(64), - Height = Application.GetRealHeight(667 - 64-49+20), + Height = Application.GetRealHeight(667 - 64-49+30), BackgroundColor = CSS_Color.MainBackgroundColor, IsShowPoint = false }; @@ -639,6 +639,13 @@ break; case ShowFunction.Music: btnName.TextID = StringId.Music; + btnFunctionViewBg.MouseUpEventHandler = (sender, e) => + { + var musicMain = new 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 +718,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