From b69d7735274b8d0f741da8a6bb8b8e1347477a5a Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 19 三月 2020 17:14:16 +0800
Subject: [PATCH] 20200319
---
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
similarity index 86%
rename from HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs
rename to HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 49ed8b5..4881199 100644
--- a/HDL_ON/UI/UI2/2-Classification/Room/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -12,11 +12,11 @@
/// <summary>
/// 褰撳墠绐椾綋
/// </summary>
- FrameLayout bodyView;
+ static FrameLayout bodyView;
/// <summary>
/// 鍔熻兘鍒楄〃闆嗗悎鏄剧ず鍖哄煙
/// </summary>
- //VerticalScrolViewLayout functionListView;
+ static VerticalScrolViewLayout functionListView;
#endregion
#region
@@ -34,7 +34,7 @@
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
new TopViewDiv(bodyView,room.name).LoadTopView();
- var functionListView =new VerticalScrolViewLayout()
+ functionListView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(64),
Height = Application.GetRealHeight(603-12),
@@ -48,7 +48,7 @@
if (function.functionType == "RGB" || function.functionType == "Dimmer")
{
- var functionDiv = new RoomControlZone(function)
+ var functionDiv = new FunctionControlZone(function)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -57,14 +57,14 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.functionCategory.ToString() + "-" + function.functionType
+ Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
}
else
{
- var functionDiv = new RoomControlZone(function)
+ var functionDiv = new FunctionControlZone(function)
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -73,7 +73,7 @@
BorderColor = 0x00FFFFFF,
BorderWidth = 1,
BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = function.functionCategory.ToString() + "-" + function.functionType
+ Tag = function.functionCategory.ToString() + "-" + function.functionType + "-" + function.sid
};
functionDiv.LoadFunctionDiv();
functionListView.AddChidren(functionDiv);
--
Gitblit v1.8.0