From 7d005a7618e3d7a80d8ede3baf6ecc4bf8019cd5 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 01 九月 2020 15:22:09 +0800
Subject: [PATCH] 2020-09-01
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 78 +++++++++++++++++++++++----------------
1 files changed, 46 insertions(+), 32 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 70c1aa9..c9480f1 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -71,7 +71,7 @@
{
bodyView = this;
roomsShowed = new List<Room>();
- roomsShowed.AddRange(DB_ResidenceData.residenceData.rooms);
+ roomsShowed.AddRange(DB_ResidenceData.rooms);
}
public void LoadPage()
@@ -252,7 +252,7 @@
Y = Application.GetRealHeight(12 - 2),
Width = Application.GetRealWidth(266),
Height = Application.GetRealHeight(22 + 2 + 2),
- Text = room.floor + " " + room.name,
+ Text = room.floorName + room.name,
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.SubheadingFontSize,
@@ -358,7 +358,8 @@
};
roomListView.AddChidren(btn);
- roomViewbgColor.MouseUpEventHandler += (sender, e) => {
+ roomViewbgColor.MouseUpEventHandler += (sender, e) =>
+ {
var view = new RoomPage(room);
MainPage.BasePageView.AddChidren(view);
view.LoadPage();
@@ -390,7 +391,7 @@
if (DB_ResidenceData.residenceData.functionTypeList.Count > 4)
{
- functionContentView.Height += Application.GetRealHeight((220 * (DB_ResidenceData.residenceData.functionTypeList.Count - 4 - 2) / 2) + 20);
+ functionContentView.Height += Application.GetRealHeight((220 * (DB_ResidenceData.residenceData.functionTypeList.Count - 4 - 2) / 2) + 20);
}
functionsPageView.AddChidren(functionContentView);
@@ -475,8 +476,8 @@
case ShowFunction.Light:
#region Light
btnName.TextID = StringId.Lights;
- functionCount = DB_ResidenceData.residenceData.functionList.lights.Count;
- functionOnCount = DB_ResidenceData.residenceData.functionList.lights.FindAll((obj) => obj.on_off == "on" ).Count;
+ functionCount = DB_ResidenceData.functionList.lights.Count;
+ functionOnCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
Button btnLightPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -488,10 +489,12 @@
IsSelected = functionCount == functionOnCount
};
functionView.AddChidren(btnLightPower);
- btnLightPower.MouseUpEventHandler = (sender, e) => {
- LoadEvent_SwitchFunction(btnLightPower,item);
+ btnLightPower.MouseUpEventHandler = (sender, e) =>
+ {
+ LoadEvent_SwitchFunction(btnLightPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(StringId.Lights);
@@ -502,8 +505,8 @@
case ShowFunction.AC:
#region AC
btnName.TextID = StringId.AC;
- functionCount = DB_ResidenceData.residenceData.functionList.aCs.Count;
- functionOnCount = DB_ResidenceData.residenceData.functionList.aCs.FindAll((obj) => obj.on_off == "on" ).Count;
+ functionCount = DB_ResidenceData.functionList.aCs.Count;
+ functionOnCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
Button btnAcPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -515,10 +518,12 @@
IsSelected = functionCount == functionOnCount
};
functionView.AddChidren(btnAcPower);
- btnAcPower.MouseUpEventHandler = (sender, e) => {
+ btnAcPower.MouseUpEventHandler = (sender, e) =>
+ {
LoadEvent_SwitchFunction(btnAcPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(StringId.AC);
@@ -529,8 +534,8 @@
case ShowFunction.Curtain:
#region Curtain
btnName.TextID = StringId.Curtain;
- functionCount = DB_ResidenceData.residenceData.functionList.curtains.Count;
- functionOnCount = DB_ResidenceData.residenceData.functionList.curtains.FindAll((obj) => obj.on_off == "on").Count;
+ functionCount = DB_ResidenceData.functionList.curtains.Count;
+ functionOnCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
Button btnClose;
btnClose = new Button()
{
@@ -557,7 +562,8 @@
functionView.AddChidren(btnOpen);
LoadEvent_CurtainSwitch(btnClose, btnOpen);
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(StringId.Curtain);
@@ -568,8 +574,8 @@
case ShowFunction.FloorHeating:
#region 鍦扮儹
btnName.TextID = StringId.FloorHeating;
- functionCount = DB_ResidenceData.residenceData.functionList.floorHeatings.Count;
- functionOnCount = DB_ResidenceData.residenceData.functionList.floorHeatings.FindAll((obj) => obj.on_off == "on").Count;
+ functionCount = DB_ResidenceData.functionList.floorHeatings.Count;
+ functionOnCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
Button btnFhPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -581,10 +587,12 @@
IsSelected = functionCount == functionOnCount
};
functionView.AddChidren(btnFhPower);
- btnFhPower.MouseUpEventHandler = (sender, e) => {
+ btnFhPower.MouseUpEventHandler = (sender, e) =>
+ {
LoadEvent_SwitchFunction(btnFhPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(StringId.FloorHeating);
@@ -598,8 +606,8 @@
case ShowFunction.Electric:
#region 鐢靛櫒
btnName.TextID = StringId.Electric;
- functionCount = DB_ResidenceData.residenceData.functionList.electricals.Count;
- functionOnCount = DB_ResidenceData.residenceData.functionList.electricals.FindAll((obj) => obj.on_off == "on").Count;
+ functionCount = DB_ResidenceData.functionList.electricals.Count;
+ functionOnCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
Button btnElectricPower = new Button()
{
X = Application.GetRealWidth(120),
@@ -611,10 +619,12 @@
IsSelected = functionCount == functionOnCount
};
functionView.AddChidren(btnElectricPower);
- btnElectricPower.MouseUpEventHandler = (sender, e) => {
+ btnElectricPower.MouseUpEventHandler = (sender, e) =>
+ {
LoadEvent_SwitchFunction(btnElectricPower, item);
};
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var skipView = new FunctionPage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage(StringId.Electric);
@@ -628,7 +638,8 @@
case ShowFunction.Environmental:
#region 鐜鏁版嵁
btnName.TextID = StringId.EnvironmentalData;
- btnFunctionViewBg.MouseUpEventHandler = (sender, e) => {
+ btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
+ {
var skipView = new EnvironmentalSciencePage();
MainPage.BasePageView.AddChidren(skipView);
skipView.LoadPage();
@@ -642,7 +653,7 @@
case ShowFunction.Music:
btnName.TextID = StringId.Music;
functionCount = Music.A31MusicModel.A31MusicModelList.Count;
- functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.on_off == "on").Count;
+ functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
btnFunctionViewBg.MouseUpEventHandler = (sender, e) =>
{
var musicMain = new Music.MusicMain();
@@ -694,11 +705,13 @@
/// </summary>
void LoadDialog_ChangeFloor()
{
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
var dialog = new Dialog();
var dialogBody = new FrameLayout();
dialog.AddChidren(dialogBody);
- dialogBody.MouseUpEventHandler += (sender1, e1) => {
+ dialogBody.MouseUpEventHandler += (sender1, e1) =>
+ {
dialog.Close();
};
@@ -724,7 +737,8 @@
if (DB_ResidenceData.residenceData.floors.Count < 2)
{
- }else if (DB_ResidenceData.residenceData.floors.Count < 3)
+ }
+ else if (DB_ResidenceData.residenceData.floors.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -814,13 +828,13 @@
roomsShowed.Clear();
if (floor == Language.StringByID(StringId.All))
{
- roomsShowed.AddRange(DB_ResidenceData.residenceData.rooms);
+ roomsShowed.AddRange(DB_ResidenceData.rooms);
}
else
{
- foreach (var room in DB_ResidenceData.residenceData.rooms)
+ foreach (var room in DB_ResidenceData.rooms)
{
- if (room.floor == floor)
+ if (room.floorName == floor)
{
roomsShowed.Add(room);
}
--
Gitblit v1.8.0