From a5d97619f0370a78d775bca474cc6d1bf58d21ed Mon Sep 17 00:00:00 2001
From: tzy <hxb@hdlchina.com.cn>
Date: 星期三, 09 六月 2021 11:25:33 +0800
Subject: [PATCH] 一个新版本

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |   40 ++++++++++++++++++++++++++--------------
 1 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index f2f00ae..871b7a1 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);
@@ -380,6 +381,11 @@
                 MainPage.Log($"HomePage LoadPage Error : {ex.Message}");
             }
 
+
+#if DEBUG
+            //FunctionList.List.Functions.Add(new Function() { spk = SPK.ClothesHanger, name = "娴嬭瘯鍑夐湼", attributes = new List<FunctionAttributes> { new FunctionAttributes { key = FunctionAttributeKey.HotDry } ,new FunctionAttributes { key = FunctionAttributeKey.HotDryTime } ,new FunctionAttributes { key = FunctionAttributeKey.HotDryTimeLeft } } });
+#endif
+
         }
         /// <summary>
         /// 鍔犺浇鍐呭鍖哄煙
@@ -466,12 +472,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;
@@ -731,12 +743,12 @@
                     SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                     UnSelectedImagePath = "Collection/CollectionIcon.png",
                 };
-                //view.AddChidren(btnCollection);
+                view.AddChidren(btnCollection);
                 //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
-                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
-                {
-                    view.AddChidren(btnCollection);
-                }
+                //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+                //{
+                //    view.AddChidren(btnCollection);
+                //}
 
                 LoadEvent_FunctionCollection(btnCollection, function);
                 if (//SPK.CurtainSpkList().Contains(function.spk))
@@ -1005,7 +1017,7 @@
                     Width = Application.GetRealWidth(32),
                     UnSelectedImagePath = "Public/FuncInfoSetIcon_white.png",
                 };
-                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+                if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
                 {
                     view.AddChidren(btnSettingIcon);
                 }
@@ -1050,12 +1062,12 @@
                     SelectedImagePath = "Collection/CollectionWhiteIcon.png",
                     UnSelectedImagePath = "Collection/CollectionIcon.png",
                 };
-                //view.AddChidren(btnCollection);
+                view.AddChidren(btnCollection);
                 //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
-                if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
-                {
-                    view.AddChidren(btnCollection);
-                }
+                //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+                //{
+                //    view.AddChidren(btnCollection);
+                //}
 
                 LoadEvent_SceneCollection(btnCollection, scene);
 

--
Gitblit v1.8.0