From ed9547e90c664739da9d3535bc01f66f24e184db Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 09 六月 2021 17:46:32 +0800
Subject: [PATCH] Merge branch 'tzy2' into wxr6
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 089c4e8..6fc5a4a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -17,7 +17,10 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
+ if (updataTemp.spk == bodyView.function.spk && updataTemp.sid == bodyView.function.sid)
+ {
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
+ }
}
catch (Exception ex)
{
@@ -78,9 +81,29 @@
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add("on_off", function.trait_on_off.curValue.ToString());
DriverLayer.Control.Ins.SendWriteCommand(function, d);
- //Control.Send(CommandType_A.write, function);
})
{ IsBackground = true }.Start();
+
+ //new System.Threading.Thread(() =>
+ //{
+ // bool fff = false;
+ // while (true)
+ // {
+ // System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
+ // if (fff)
+ // {
+ // d.Add("on_off", "off");
+ // }
+ // else
+ // {
+ // d.Add("on_off", "on");
+ // }
+ // fff = !fff;
+ // DriverLayer.Control.Ins.SendWriteCommand(function, d);
+ // //System.Threading.Thread.Sleep(100);
+ // }
+ //})
+ //{ IsBackground = true }.Start();
};
}
--
Gitblit v1.8.0