From 171bf03f3664226eeff2b20ee9bd2e914b63a17d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 13 三月 2020 09:18:50 +0800
Subject: [PATCH] 20200313
---
HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs | 14 +++++---------
1 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs
index 290e65f..49ed8b5 100644
--- a/HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs
@@ -32,7 +32,7 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new PublicAssmebly().LoadTopView(bodyView, room.name);
+ new TopViewDiv(bodyView,room.name).LoadTopView();
var functionListView =new VerticalScrolViewLayout()
{
@@ -42,14 +42,13 @@
bodyView.AddChidren(functionListView);
- foreach (var function in room.functions)
+ foreach (var function in room.functionData)
{
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- //var functionDiv = new FunctionDiv(function);
if (function.functionType == "RGB" || function.functionType == "Dimmer")
{
- var functionDiv = new FunctionDiv(function)
+ var functionDiv = new RoomControlZone(function)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -65,7 +64,7 @@
}
else
{
- var functionDiv = new FunctionDiv(function)
+ var functionDiv = new RoomControlZone(function)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -79,11 +78,8 @@
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
}
-
}
+
}
-
-
-
}
}
--
Gitblit v1.8.0