From f718d23a262a5a8e1241fdeaeb4153399f95e79d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 21 四月 2020 09:19:05 +0800
Subject: [PATCH] 20200421
---
HDL_ON/UI/UI2/1-HomePage/HomePage.cs | 65 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
index d53cdaf..be8e5ec 100644
--- a/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
+++ b/HDL_ON/UI/UI2/1-HomePage/HomePage.cs
@@ -106,7 +106,7 @@
TextColor = CSS.CSS_Color.MainBackgroundColor,
TextSize = CSS.CSS_FontSize.EmphasisFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = DB_ResidenceData.residenceData.residenceName,
+ Text = DB_ResidenceData.residenceData.residecenInfo.Name,
IsBold = true
};
topView.AddChidren(btnResidenceName);
@@ -424,7 +424,7 @@
};
rowView.AddChidren(functionView);
- LoadSceneFunctionDiv(functionView, function);
+ LoadSceneFunctionDiv( functionView, function);
index++;
}
}
@@ -606,36 +606,6 @@
{
try
{
- Button btnCoverd = new Button()
- {
- UnSelectedImagePath = "Collection/SceneCovered.png",
- };
- view.AddChidren(btnCoverd);
- LoadEvent_ControlScene(btnCoverd, function);
-
- Button btnDelayIcon;
- btnDelayIcon = new Button()
- {
- X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(12),
- Height = Application.GetRealWidth(24),
- Width = Application.GetRealWidth(24),
- UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
- };
- view.AddChidren(btnDelayIcon);
-
- Button btnCollection;
- btnCollection = new Button()
- {
- X = Application.GetRealWidth(116),
- Y = Application.GetRealWidth(8),
- Width = Application.GetMinRealAverage(32),
- Height = Application.GetMinRealAverage(32),
- SelectedImagePath = "Collection/CollectionWhiteIcon.png",
- UnSelectedImagePath = "Collection/CollectionIcon.png",
- };
- view.AddChidren(btnCollection);
- LoadEvent_FunctionCollection(btnCollection, function, false);
Button btnName;
btnName = new Button()
{
@@ -665,6 +635,37 @@
};
view.AddChidren(btnZone);
+ Button btnCoverd = new Button()
+ {
+ UnSelectedImagePath = "Collection/SceneCovered.png",
+ };
+ view.AddChidren(btnCoverd);
+
+ Button btnDelayIcon;
+ btnDelayIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(12),
+ Height = Application.GetRealWidth(24),
+ Width = Application.GetRealWidth(24),
+ UnSelectedImagePath = "FunctionIcon/Scene/DelayIcon.png"
+ };
+ view.AddChidren(btnDelayIcon);
+
+ Button btnCollection;
+ btnCollection = new Button()
+ {
+ X = Application.GetRealWidth(116),
+ Y = Application.GetRealWidth(8),
+ Width = Application.GetMinRealAverage(32),
+ Height = Application.GetMinRealAverage(32),
+ SelectedImagePath = "Collection/CollectionWhiteIcon.png",
+ UnSelectedImagePath = "Collection/CollectionIcon.png",
+ };
+ view.AddChidren(btnCollection);
+ LoadEvent_FunctionCollection(btnCollection, function, false);
+
+ LoadEvent_ControlScene(btnCoverd, function);
}
catch (Exception ex)
--
Gitblit v1.8.0