From c3e1b733fc45bd9f0b88bfb560cfa87a270b079b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 九月 2020 17:33:58 +0800
Subject: [PATCH] 20200909
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 91 +++++++++++++++++++++++++++++++--------------
1 files changed, 63 insertions(+), 28 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 1e993e3..5631d77 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -45,38 +45,73 @@
if (view2.GetChildren(k).GetType() == typeof(FrameLayout))
{
var view3 = view2.GetChildren(j) as FrameLayout;
+ if(view3== null)
+ {
+ continue;
+ }
for (var o = 0; o < view3.ChildrenCount; o++)
{
if (view3.GetChildren(o).GetType() == typeof(Button))
{
var btn = view3.GetChildren(o) as Button;
- if (btn.Tag != null && btn.Tag.ToString() == functionCategory + "_onCount")
+ if (btn.Tag != null)
{
- string btnText = "0/0";
- switch (functionCategory)
+ if (btn.Tag.ToString() == functionCategory + "_onCount")
{
- case FunctionCategory.Thermostat:
- switch (functionType)
- {
- case FunctionType.FloorHeating:
- btnText = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.floorHeatings.Count;
- break;
- case FunctionType.AC:
- btnText = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.aCs.Count;
- break;
- }
- break;
- case FunctionCategory.Curtain:
- btnText = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.curtains.Count;
- break;
- case FunctionCategory.Light:
- btnText = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.lights.Count;
- break;
- case FunctionCategory.Electrical:
- btnText = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count + "/" + DB_ResidenceData.functionList.electricals.Count;
- break;
+ string btnText = "0";
+ switch (functionCategory)
+ {
+ case FunctionCategory.Thermostat:
+ switch (functionType)
+ {
+ case FunctionType.FloorHeating:
+ btnText = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count.ToString();
+ break;
+ case FunctionType.AC:
+ btnText = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count.ToString();
+ break;
+ }
+ break;
+ case FunctionCategory.Curtain:
+ btnText = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count.ToString();
+ break;
+ case FunctionCategory.Light:
+ btnText = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count.ToString();
+ break;
+ case FunctionCategory.Electrical:
+ btnText = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count.ToString();
+ break;
+ }
+ btn.Text = btnText;
}
- btn.Text = btnText;
+ else if (btn.Tag.ToString() == functionCategory + "_AllControl")
+ {
+ var openCount = 0;
+ switch (functionCategory)
+ {
+ case FunctionCategory.Thermostat:
+ switch (functionType)
+ {
+ case FunctionType.FloorHeating:
+ openCount = DB_ResidenceData.functionList.floorHeatings.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ break;
+ case FunctionType.AC:
+ openCount = DB_ResidenceData.functionList.aCs.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ break;
+ }
+ break;
+ case FunctionCategory.Curtain:
+ openCount = DB_ResidenceData.functionList.curtains.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ break;
+ case FunctionCategory.Light:
+ openCount = DB_ResidenceData.functionList.lights.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ break;
+ case FunctionCategory.Electrical:
+ openCount = DB_ResidenceData.functionList.electricals.FindAll((obj) => obj.trait_on_off.value.ToString() == "on").Count;
+ break;
+ }
+ btn.IsSelected = openCount != 0;
+ }
}
}
}
@@ -162,7 +197,7 @@
}
f.trait_on_off.value = "off";
//Control.Send(CommandType_A.write, f);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
Control.SendWriteCommand(f, d);
}
@@ -266,7 +301,7 @@
{
f.trait_on_off.value = btn.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, f);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
Control.SendWriteCommand(f, d);
}
@@ -279,7 +314,7 @@
{
f.trait_on_off.value = btn.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, f);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
Control.SendWriteCommand(f, d);
}
@@ -307,7 +342,7 @@
{
f.trait_on_off.value = "on";
//Control.Send(CommandType_A.write, f);
- System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.value.ToString());
Control.SendWriteCommand(f, d);
}
--
Gitblit v1.8.0