From 6e8dba90956d7068df68144aa4c6d1189e596255 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 09 七月 2021 17:17:03 +0800
Subject: [PATCH] 调光设备本地控制问题
---
HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
index 606a378..ba8453a 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs
@@ -269,7 +269,7 @@
}
});
runCount++;
- System.Threading.Thread.Sleep(8);
+ System.Threading.Thread.Sleep(12);
}
Application.RunOnMainThread(() =>
{
@@ -307,6 +307,7 @@
Height = Application.GetRealWidth(192 + 20),//2020-12-01 鎴块棿鍥剧墖姣斾緥鏀瑰洖16:9
Radius = (uint)Application.GetRealWidth(12),
Tag = room.roomId,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
};
roomListView.AddChidren(roomView);
@@ -323,7 +324,7 @@
Height = Application.GetRealWidth(70 + 20),
Radius = (uint)Application.GetRealWidth(12),
Tag = room.roomId,
- BackgroundColor = CSS_Color.BackgroundColor,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
};
roomListView.AddChidren(roomView);
LoadSmallPirtureRoomRow(roomView, room);
@@ -509,9 +510,10 @@
roomView.RemoveAll();
roomFloorChangeView.BackgroundColor = roomListView.BackgroundColor = CSS_Color.BackgroundColor;
roomView.BackgroundColor = CSS_Color.BackgroundColor;
+ //roomView.BackgroundColor = CSS_Color.MainBackgroundColor;
- var viewbg = new ImageView()
+ var viewbg = new Button()
{
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(70),
@@ -556,10 +558,10 @@
var btnAllClose = new Button()
{
- X = Application.GetRealWidth(288),
- Y = Application.GetRealWidth(10),
- Width = Application.GetMinRealAverage(58),
- Height = Application.GetMinRealAverage(58),
+ X = Application.GetRealWidth(278),
+ Y = Application.GetRealWidth(15),
+ Width = Application.GetMinRealAverage(50),
+ Height = Application.GetMinRealAverage(50),
UnSelectedImagePath = "Classification/Room/AllCloseIcon2.png",
Tag = "AllClose",
Visible = false
@@ -699,13 +701,7 @@
functionOnCount = FunctionList.List.GetAirFreshList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
break;
case ShowFunction.Music:
- //functionCount = Music.A31MusicModel.A31MusicModelList.Count;
- //functionOnCount = Music.A31MusicModel.A31MusicModelList.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
- //if(functionCount == 0)
- //{
- // functionCount = FunctionList.List.GetMusicList().Count;
- //}
- functionCount = 1;
+ functionCount = FunctionList.List.GetMusicList().Count;
break;
case ShowFunction.Panel:
break;
--
Gitblit v1.8.0