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 | 126 ++++++++++++++++++++---------------------
1 files changed, 62 insertions(+), 64 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index aa5e367..d480411 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -44,10 +44,19 @@
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;
+ case SPK.AirFreshJinmao:
+ case SPK.AirFreshStandard:
+ vv = ShowFunction.FreshAir;
+ break;
}
- UpdataFunctionOnCount(vv, function.functionType);
+ UpdataFunctionOnCount(vv, function.spk);
UpdataCloseAllButton(function);
}
catch
@@ -60,7 +69,7 @@
/// 鏇存柊鍔熻兘鎵撳紑鏁伴噺
/// </summary>
/// <param name="functionCategory"></param>
- static void UpdataFunctionOnCount(ShowFunction functionCategory, FunctionType functionType)
+ static void UpdataFunctionOnCount(ShowFunction functionCategory, string functionType)
{
try
{
@@ -95,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";
}
}
}
@@ -192,7 +185,7 @@
{
continue;
}
- var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on" && obj.functionCategory != FunctionCategory.Scene);
+ var ssd = r.GetRoomFunctions(false).FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on");
var sss = ssd.Count;
if (sss == 0)
{
@@ -222,11 +215,6 @@
{
foreach (var f in room.GetRoomFunctions(false))
{
- if (f.functionCategory == FunctionCategory.Scene)
- {
- continue;
- }
-
f.trait_on_off.curValue = "off";
Dictionary<string, string> d = new Dictionary<string, string>();
d.Add("on_off", f.trait_on_off.curValue.ToString());
@@ -249,10 +237,6 @@
};
foreach (var f in room.GetRoomFunctions(false))
{
- if (f.functionCategory == FunctionCategory.Scene)
- {
- continue;
- }
if (f.trait_on_off.curValue.ToString() == "on")
{
btn.Visible = true;
@@ -341,16 +325,20 @@
view.AddChidren(waitPage);
waitPage.BackgroundColor = 0x00000000;
waitPage.Start("");
+
+
new System.Threading.Thread(() =>
{
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>();
@@ -360,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>();
@@ -370,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>();
@@ -380,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>();
@@ -397,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);
}
@@ -405,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);
}
@@ -413,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);
}
@@ -421,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);
}
@@ -468,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);
@@ -499,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