From 06696e6f225733a60b03eea4a7c6374053d92c1d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 14 四月 2020 14:15:35 +0800
Subject: [PATCH] 20200414
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 50 ++++++++++++++++++++++++++++----------------------
1 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 28f6aaf..bbff704 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -17,7 +17,7 @@
Application.RunOnMainThread(() => {
if (bodyView == null)
return;
- UpdataFunctionOnCount(function.functionCategory);
+ UpdataFunctionOnCount(function.functionCategory,function.functionType);
UpdataCloseAllButton(function);
});
}
@@ -26,7 +26,7 @@
/// 鏇存柊鍔熻兘鎵撳紑鏁伴噺
/// </summary>
/// <param name="functionCategory"></param>
- static void UpdataFunctionOnCount(FunctionCategory functionCategory)
+ static void UpdataFunctionOnCount(FunctionCategory functionCategory,FunctionType functionType)
{
for (int i = 0; i < bodyView.functionsPageView.ChildrenCount; i++)
{
@@ -53,11 +53,18 @@
string btnText = "0/0";
switch (functionCategory)
{
- case FunctionCategory.AC:
- btnText = DB_ResidenceData.residenceData.functionList.aCs.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.lights.Count;
+ case FunctionCategory.Thermostat:
+ switch (functionType)
+ {
+ case FunctionType.FloorHeating:
+ break;
+ case FunctionType.AC:
+ btnText = DB_ResidenceData.residenceData.functionList.aCs.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.aCs.Count;
+ break;
+ }
break;
case FunctionCategory.Curtain:
- btnText = DB_ResidenceData.residenceData.functionList.curtains.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.lights.Count;
+ btnText = DB_ResidenceData.residenceData.functionList.curtains.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.curtains.Count;
break;
case FunctionCategory.Light:
btnText = DB_ResidenceData.residenceData.functionList.lights.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.lights.Count;
@@ -125,19 +132,6 @@
{
try
{
- btn.Visible = false;
- foreach (var f in room.functions)
- {
- if(f.functionCategory == FunctionCategory.Scene)
- {
- continue;
- }
- if (f.on_off == "on")
- {
- btn.Visible = true;
- return;
- }
- }
btn.MouseUpEventHandler = (sender, e) =>
{
Action action = () =>
@@ -155,6 +149,18 @@
};
new PublicAssmebly().TipMsg(StringId.Tip, StringId.TipCloseAllFunctionInRoom, action);
};
+ foreach (var f in room.functions)
+ {
+ if (f.functionCategory == FunctionCategory.Scene)
+ {
+ continue;
+ }
+ if (f.on_off == "on")
+ {
+ btn.Visible = true;
+ break;
+ }
+ }
}
catch (Exception ex)
{
@@ -228,23 +234,23 @@
/// <summary>
/// 鍏抽棴鎵撳紑鍏ㄩ儴閫変腑绫诲瀷鍔熻兘
/// </summary>
- void LoadEvent_SwitchFunction(Button btn,FunctionCategory functionCategory)
+ void LoadEvent_SwitchFunction(Button btn, ShowFunction functionCategory)
{
btn.MouseUpEventHandler = (sender, e) => {
btn.IsSelected = !btn.IsSelected;
switch(functionCategory)
{
- case FunctionCategory.AC:
+ case ShowFunction.AC:
foreach(var f in DB_ResidenceData.residenceData.functionList.aCs)
{
f.on_off = btn.IsSelected ? "on" : "off";
Control.Send(CommandType_A.write, f);
}
break;
- case FunctionCategory.Curtain:
+ case ShowFunction.Curtain:
break;
- case FunctionCategory.Light:
+ case ShowFunction.Light:
foreach (var f in DB_ResidenceData.residenceData.functionList.lights)
{
f.on_off = btn.IsSelected ? "on" : "off";
--
Gitblit v1.8.0