From 1d25d355cb0efc9685a8ad5c870b5941b95ce9b8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 30 三月 2021 09:11:57 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 106 ++++++++++++++++++++++++++---------------------------
1 files changed, 52 insertions(+), 54 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index f08679c..d6371a6 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
@@ -44,6 +44,11 @@
vv = ShowFunction.Light;
break;
case SPK.ElectricSocket:
+ case SPK.ElectricTuyaAirCleaner:
+ case SPK.ElectricTuyaFan:
+ case SPK.ElectricTuyaWaterValve:
+ case SPK.ElectricTuyaWeepRobot:
+ case SPK.ClothesHanger:
vv = ShowFunction.Electric;
break;
}
@@ -53,7 +58,7 @@
catch
{
}
- }));
+ });
}
/// <summary>
@@ -95,51 +100,32 @@
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;
+ }
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";
}
}
}
@@ -338,12 +324,14 @@
{
try
{
- if (DB_ResidenceData.Instance.GatewayType == 0 && !Control.Ins.IsRemote)
+ //鍏ㄥ紑鍏ㄥ叧
+ //if (DB_ResidenceData.Instance.GatewayType == 0 && !Control.Ins.IsRemote)
+ if (Control.Ins.GatewayOnline_Local)
{
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>();
@@ -353,7 +341,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>();
@@ -363,7 +351,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>();
@@ -373,7 +361,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>();
@@ -390,7 +388,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);
}
@@ -398,7 +396,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);
}
@@ -406,7 +404,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);
}
@@ -414,7 +412,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);
}
@@ -461,10 +459,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);
@@ -492,10 +490,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