From 09dfbfd9b77ec887c17b10f15799a1d3f56e4e17 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 15 十二月 2020 12:04:42 +0800
Subject: [PATCH] 2020-12-15-1

---
 HDL_ON/UI/UI2/1-HomePage/HomePage.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index 1a3df0a..83b6eee 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -102,7 +102,7 @@
                 topView = new FrameLayout()
                 {
                     Height = Application.GetRealHeight(216),
-                    BackgroundImagePath = DB_ResidenceData.residenceData.residenceImage,
+                    BackgroundImagePath = DB_ResidenceData.Instance.residenceImage,
                 };
                 bodyView.AddChidren(topView);
 
@@ -148,7 +148,7 @@
                     TextColor = CSS_Color.MainBackgroundColor,
                     TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
                     TextAlignment = TextAlignment.CenterLeft,
-                    Text = DB_ResidenceData.residenceData.residecenInfo.Name,
+                    Text = DB_ResidenceData.Instance.CurrentRegion.Name,
                     IsBold = true
                 };
                 topView.AddChidren(btnResidenceName);
@@ -395,7 +395,7 @@
             try
             {
                 int index = 0;
-                foreach (var function in DB_ResidenceData.functionList.GetAllDeviceFunctionList())
+                foreach (var function in FunctionList.List.GetDeviceFunctionList())
                 {
                     //闊充箰妯″潡鏈変富浠庡叧绯伙紝闇�瑕佺壒娈婂鐞�
                     if (function.functionCategory == FunctionCategory.Music)
@@ -510,7 +510,7 @@
             try
             {
                 int index = 0;
-                foreach (var scene in DB_ResidenceData.functionList.scenes)
+                foreach (var scene in FunctionList.List.scenes)
                 {
                     if (!scene.collect)
                         continue;

--
Gitblit v1.8.0