From c4f0723cc7053933a6e598eb0c58cfdf4e9d7459 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 04 一月 2021 14:13:01 +0800
Subject: [PATCH] Merge branch 'WJC' into NewFilePath
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 125 ++++++++++++++++++++++++++++-------------
1 files changed, 84 insertions(+), 41 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 7f604b2..aa5e367 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -345,48 +345,91 @@
{
try
{
- switch (functionCategory)
+ if (DB_ResidenceData.Instance.GatewayType == 0 && !Control.Ins.IsRemote)
{
- case ShowFunction.AC:
- foreach (var f in FunctionList.List.aCs)
- {
- 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.FloorHeating:
- foreach (var f in FunctionList.List.floorHeatings)
- {
- 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.Light:
- foreach (var f in FunctionList.List.lights)
- {
- 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.Electric:
- foreach (var f in FunctionList.List.electricals)
- {
- 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;
+ switch (functionCategory)
+ {
+ case ShowFunction.AC:
+ foreach (var f in FunctionList.List.aCs)
+ {
+ 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.FloorHeating:
+ foreach (var f in FunctionList.List.floorHeatings)
+ {
+ 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.Light:
+ foreach (var f in FunctionList.List.lights)
+ {
+ 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.Electric:
+ foreach (var f in FunctionList.List.electricals)
+ {
+ 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;
+ }
+ }
+ else
+ {
+ switch (functionCategory)
+ {
+ case ShowFunction.AC:
+ List<Function> acList = new List<Function>();
+ foreach(var f in FunctionList.List.aCs)
+ {
+ acList.Add(f);
+ }
+ Control.Ins.SwtichFunctions(onoff == "on", acList);
+ break;
+ case ShowFunction.FloorHeating:
+ List<Function> fhList = new List<Function>();
+ foreach (var f in FunctionList.List.floorHeatings)
+ {
+ fhList.Add(f);
+ }
+ Control.Ins.SwtichFunctions(onoff == "on", fhList);
+ break;
+ case ShowFunction.Light:
+ List<Function> lightList = new List<Function>();
+ foreach (var f in FunctionList.List.lights)
+ {
+ lightList.Add(f);
+ }
+ Control.Ins.SwtichFunctions(onoff == "on", lightList);
+ break;
+ case ShowFunction.Electric:
+ List<Function> eleList = new List<Function>();
+ foreach (var f in FunctionList.List.electricals)
+ {
+ eleList.Add(f);
+ }
+ Control.Ins.SwtichFunctions(onoff == "on", eleList);
+ break;
+ }
+
+
}
}
catch (Exception ex)
--
Gitblit v1.8.0