From ed1c010c40e9324318171edefec5e9dbf46474a4 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 18 十二月 2020 18:01:09 +0800
Subject: [PATCH] 20201218-4
---
HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
index 73ab724..09049ff 100644
--- a/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
+++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPageBLL.cs
@@ -20,8 +20,13 @@
Application.RunOnMainThread(() => {
if (bodyView == null)
return;
- UpdataFunctionOnCount(function.functionCategory,function.functionType);
- UpdataCloseAllButton(function);
+ try
+ {
+ UpdataFunctionOnCount(function.functionCategory, function.functionType);
+ UpdataCloseAllButton(function);
+ }catch
+ {
+ }
});
}
@@ -319,7 +324,7 @@
f.trait_on_off.curValue = onoff;
//Control.Send(CommandType_A.write, f);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", f.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(f, d);
}
break;
@@ -337,9 +342,17 @@
foreach (var f in FunctionList.List.lights)
{
f.trait_on_off.curValue = onoff;
- //Control.Send(CommandType_A.write, f);
Dictionary<string, string> d = new Dictionary<string, string>();
- d.Add("on_off", f.trait_on_off.curValue.ToString());
+ d.Add(FunctionAttributeKey.OnOff, f.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(f, d);
+ }
+ 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);
}
break;
@@ -356,6 +369,9 @@
{
btnOpen.MouseUpEventHandler = (sender, e) =>
{
+ DB_ResidenceData.Instance.GlobalCurtainStatus = true;
+ btnOpen.IsSelected = true;
+ btnClose.IsSelected = false;
foreach (var f in FunctionList.List.curtains)
{
f.trait_on_off.curValue = "on";
@@ -368,6 +384,9 @@
btnClose.MouseUpEventHandler = (sender, e) =>
{
+ DB_ResidenceData.Instance.GlobalCurtainStatus = false;
+ btnClose.IsSelected = true;
+ btnOpen.IsSelected = false;
foreach (var f in FunctionList.List.curtains)
{
f.trait_on_off.curValue = "off";
--
Gitblit v1.8.0