From 2a23fbede38fadaf7060510a3cd72a93a8a95ec0 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 18 十二月 2020 17:49:46 +0800
Subject: [PATCH] 2020-12-18-3
---
HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
index 4e490a8..4cc12db 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/IntelligencePage.cs
@@ -69,7 +69,7 @@
};
bodyView.AddChidren(topView);
- if (DB_ResidenceData.residenceData.GatewayType == 0)
+ if (DB_ResidenceData.Instance.GatewayType == 0)
{
btnSceneTilte = new Button()
{
@@ -200,7 +200,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.residenceData.CurFoor,
+ Text = DB_ResidenceData.Instance.CurFloor.roomName,
};
floorChangeView.AddChidren(btnFloor);
@@ -227,7 +227,7 @@
try
{
int index = 0;
- foreach (var scene in DB_ResidenceData.functionList.scenes)
+ foreach (var scene in FunctionList.List.scenes)
{
//if (scene.roomIds.Count == 0)//濡備綍鍦ㄦ埧闂村凡缁忕Щ闄や簡杩欎釜鍔熻兘锛屽垯鏀惰棌鐣岄潰涔熶笉浼氬啀鏄剧ず
//{
@@ -374,7 +374,6 @@
Action refreshAction = () => {
btnName.Text = scene.name;
btnZone.Text = scene.GetRoomListName();
- //view.BackgroundImagePath = scene.ImagePath;
//2020-12-03 淇敼鍥剧墖鍔犺浇鏂规硶
ImageUtlis.Current.LoadLocalOrNetworkImages((scene as Scene).ImagePath, view);
};
--
Gitblit v1.8.0