From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 53 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index b3624ab..d480411 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -17,7 +17,7 @@
/// <param name="function"></param>
public static void UpdataInfo(Function function)
{
- Application.RunOnMainThread((Action)(() => {
+ Application.RunOnMainThread(() => {
if (bodyView == null)
return;
try
@@ -48,7 +48,12 @@
case SPK.ElectricTuyaFan:
case SPK.ElectricTuyaWaterValve:
case SPK.ElectricTuyaWeepRobot:
+ case SPK.ClothesHanger:
vv = ShowFunction.Electric;
+ break;
+ case SPK.AirFreshJinmao:
+ case SPK.AirFreshStandard:
+ vv = ShowFunction.FreshAir;
break;
}
UpdataFunctionOnCount(vv, function.spk);
@@ -57,7 +62,7 @@
catch
{
}
- }));
+ });
}
/// <summary>
@@ -99,51 +104,35 @@
var btn = view3.GetChildren(o) as Button;
if (btn.Tag != null)
{
+ string btnText = "0";
+ switch (functionCategory)
+ {
+ case ShowFunction.FloorHeating:
+ btnText = FunctionList.List.GetFloorHeatingList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ break;
+ case ShowFunction.AC:
+ btnText = FunctionList.List.GetAcList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ break;
+ case ShowFunction.Curtain:
+ btnText = FunctionList.List.GetCurtainList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ break;
+ case ShowFunction.Light:
+ btnText = FunctionList.List.GetLightList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ break;
+ case ShowFunction.Electric:
+ btnText = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ break;
+ case ShowFunction.FreshAir:
+ btnText = FunctionList.List.GetAirFreshList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
+ break;
+ }
if (btn.Tag.ToString() == functionCategory + "_onCount")
{
- string btnText = "0";
- switch (functionCategory)
- {
- case ShowFunction.FloorHeating:
- btnText = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
- break;
- case ShowFunction.AC:
- btnText = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
- break;
- case ShowFunction.Curtain:
- btnText = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
- break;
- case ShowFunction.Light:
- btnText = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
- break;
- case ShowFunction.Electric:
- btnText = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count.ToString();
- break;
- }
btn.Text = btnText;
}
else if (btn.Tag.ToString() == functionCategory + "_AllControl")
{
- var openCount = 0;
- switch (functionCategory)
- {
- case ShowFunction.FloorHeating:
- openCount = FunctionList.List.floorHeatings.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
- break;
- case ShowFunction.AC:
- openCount = FunctionList.List.aCs.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
- break;
- case ShowFunction.Curtain:
- openCount = FunctionList.List.curtains.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
- break;
- case ShowFunction.Light:
- openCount = FunctionList.List.lights.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
- break;
- case ShowFunction.Electric:
- openCount = FunctionList.List.electricals.FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count;
- break;
- }
- btn.IsSelected = openCount != 0;
+ btn.IsSelected = btnText != "0";
}
}
}
@@ -349,7 +338,7 @@
switch (functionCategory)
{
case ShowFunction.AC:
- foreach (var f in FunctionList.List.aCs)
+ foreach (var f in FunctionList.List.GetAcList())
{
f.trait_on_off.curValue = onoff;
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -359,7 +348,7 @@
}
break;
case ShowFunction.FloorHeating:
- foreach (var f in FunctionList.List.floorHeatings)
+ foreach (var f in FunctionList.List.GetFloorHeatingList())
{
f.trait_on_off.curValue = onoff;
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -369,7 +358,7 @@
}
break;
case ShowFunction.Light:
- foreach (var f in FunctionList.List.lights)
+ foreach (var f in FunctionList.List.GetLightList())
{
f.trait_on_off.curValue = onoff;
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -379,7 +368,17 @@
}
break;
case ShowFunction.Electric:
- foreach (var f in FunctionList.List.electricals)
+ foreach (var f in FunctionList.List.GetElectricals())
+ {
+ f.trait_on_off.curValue = onoff;
+ Dictionary<string, string> d = new Dictionary<string, string>();
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(f, d);
+ System.Threading.Thread.Sleep(100);
+ }
+ break;
+ case ShowFunction.FreshAir:
+ foreach (var f in FunctionList.List.GetAirFreshList())
{
f.trait_on_off.curValue = onoff;
Dictionary<string, string> d = new Dictionary<string, string>();
@@ -396,7 +395,7 @@
{
case ShowFunction.AC:
List<Function> acList = new List<Function>();
- foreach(var f in FunctionList.List.aCs)
+ foreach(var f in FunctionList.List.GetAcList())
{
acList.Add(f);
}
@@ -404,7 +403,7 @@
break;
case ShowFunction.FloorHeating:
List<Function> fhList = new List<Function>();
- foreach (var f in FunctionList.List.floorHeatings)
+ foreach (var f in FunctionList.List.GetFloorHeatingList())
{
fhList.Add(f);
}
@@ -412,7 +411,7 @@
break;
case ShowFunction.Light:
List<Function> lightList = new List<Function>();
- foreach (var f in FunctionList.List.lights)
+ foreach (var f in FunctionList.List.GetLightList())
{
lightList.Add(f);
}
@@ -420,7 +419,7 @@
break;
case ShowFunction.Electric:
List<Function> eleList = new List<Function>();
- foreach (var f in FunctionList.List.electricals)
+ foreach (var f in FunctionList.List.GetElectricals())
{
eleList.Add(f);
}
@@ -467,10 +466,10 @@
{
try
{
- foreach (var f in FunctionList.List.curtains)
+ foreach (var f in FunctionList.List.GetCurtainList())
{
f.trait_on_off.curValue = "on";
- f.percent = 100;
+ f.SetAttrState(FunctionAttributeKey.Percent, "100");
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
@@ -498,10 +497,10 @@
DB_ResidenceData.Instance.GlobalCurtainStatus = false;
btnClose.IsSelected = true;
btnOpen.IsSelected = false;
- foreach (var f in FunctionList.List.curtains)
+ foreach (var f in FunctionList.List.GetCurtainList())
{
f.trait_on_off.curValue = "off";
- f.percent = 0;
+ f.SetAttrState(FunctionAttributeKey.Percent, "0");
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
--
Gitblit v1.8.0