From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 106 ++++++++++++++++++++++++++++++----------------------
1 files changed, 61 insertions(+), 45 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 28f6aaf..1b0f8e9 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,44 +26,58 @@
/// 鏇存柊鍔熻兘鎵撳紑鏁伴噺
/// </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++)
+ try
{
- if (bodyView.functionsPageView.GetChildren(i).GetType() == typeof(FrameLayout))
+ for (int i = 0; i < bodyView.functionsPageView.ChildrenCount; i++)
{
- var view1 = bodyView.functionsPageView.GetChildren(i) as FrameLayout;
- for (int j = 0; j < view1.ChildrenCount; j++)
+ if (bodyView.functionsPageView.GetChildren(i).GetType() == typeof(FrameLayout))
{
- if (view1.GetChildren(j).GetType() == typeof(FrameLayout))
+ var view1 = bodyView.functionsPageView.GetChildren(i) as FrameLayout;
+ for (int j = 0; j < view1.ChildrenCount; j++)
{
- var view2 = view1.GetChildren(j) as FrameLayout;
- for (var k = 0; k < view2.ChildrenCount; k++)
+ if (view1.GetChildren(j).GetType() == typeof(FrameLayout))
{
- if (view2.GetChildren(k).GetType() == typeof(FrameLayout))
+ var view2 = view1.GetChildren(j) as FrameLayout;
+ for (var k = 0; k < view2.ChildrenCount; k++)
{
- var view3 = view2.GetChildren(j) as FrameLayout;
- for (var o = 0; o < view3.ChildrenCount; o++)
+ if (view2.GetChildren(k).GetType() == typeof(FrameLayout))
{
- if (view3.GetChildren(o).GetType() == typeof(Button))
+ var view3 = view2.GetChildren(j) as FrameLayout;
+ for (var o = 0; o < view3.ChildrenCount; o++)
{
- var btn = view3.GetChildren(o) as Button;
- if (btn.Tag != null && btn.Tag.ToString() == functionCategory + "_onCount")
+ if (view3.GetChildren(o).GetType() == typeof(Button))
{
- string btnText = "0/0";
- switch (functionCategory)
+ var btn = view3.GetChildren(o) as Button;
+ if (btn.Tag != null && btn.Tag.ToString() == functionCategory + "_onCount")
{
- case FunctionCategory.AC:
- btnText = DB_ResidenceData.residenceData.functionList.aCs.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.lights.Count;
- break;
- case FunctionCategory.Curtain:
- btnText = DB_ResidenceData.residenceData.functionList.curtains.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.lights.Count;
- break;
- case FunctionCategory.Light:
- btnText = DB_ResidenceData.residenceData.functionList.lights.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.lights.Count;
- break;
+ string btnText = "0/0";
+ switch (functionCategory)
+ {
+ case FunctionCategory.Thermostat:
+ switch (functionType)
+ {
+ case FunctionType.FloorHeating:
+ btnText = DB_ResidenceData.residenceData.functionList.floorHeatings.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.floorHeatings.Count;
+ 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.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;
+ break;
+ case FunctionCategory.Electrical:
+ btnText = DB_ResidenceData.residenceData.functionList.electricals.FindAll((obj) => obj.on_off == "on").Count + "/" + DB_ResidenceData.residenceData.functionList.electricals.Count;
+ break;
+ }
+ btn.Text = btnText;
}
- btn.Text = btnText;
}
}
}
@@ -73,8 +87,11 @@
}
}
}
+ catch (Exception ex)
+ {
+ MainPage.Log($"鏇存柊鍏ㄥ叧鎸夐挳寮傚父 : {ex.Message}");
+ }
}
-
/// <summary>
/// 鏇存柊鍏ㄥ叧鍔熻兘鐘舵��
/// </summary>
@@ -125,19 +142,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 +159,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 +244,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