From f80dce34c60279a4c2054a9959df81473f4e8056 Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期二, 20 四月 2021 14:39:31 +0800 Subject: [PATCH] 1 --- HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs index f2f00ae..d8cb65e 100644 --- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs +++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs @@ -113,6 +113,7 @@ public void LoadPage() { + MainPage.CurPageIndex = 0; try { this.BeginHeaderRefreshingAction = () => @@ -163,7 +164,7 @@ TextColor = CSS_Color.MainBackgroundColor, TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel, TextAlignment = TextAlignment.CenterLeft, - Text = DB_ResidenceData.Instance.CurrentRegion.Name, + Text = DB_ResidenceData.Instance.CurrentRegion.homeName, IsBold = true }; topView.AddChidren(btnResidenceName); @@ -466,12 +467,18 @@ try { int index = 0; - foreach (var function in FunctionList.List.GetDeviceFunctionList()) + var list = FunctionList.List.GetDeviceFunctionList(); + foreach (var function in list) { //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞� if (function.Spk_Prefix == FunctionCategory.Music) { - var music = function as Music.A31MusicModel; + //var music = function as Music.A31MusicModel; + var music = Music.A31MusicModel.A31MusicModelList.Find((obj) => obj.sid == function.sid); + if (music == null) + { + continue; + } if (music.ServerClientType == -1) { continue; -- Gitblit v1.8.0