From 9acd3887f1f8db40d59f991b1726a61aa7c7637c Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 12 五月 2021 15:13:56 +0800
Subject: [PATCH] Merge branch 'CJL' into wxr4
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 35 +++++++++++++++++++++--------------
1 files changed, 21 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..83713a1 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;
@@ -731,12 +738,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 +1012,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 +1057,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