From c8dfa6df784741900a4c06918929d3db3c876234 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 16 七月 2021 10:40:56 +0800
Subject: [PATCH] Merge branch 'hxb-test' into wxr7-ez
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 57 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 43 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 2daea16..6fc5a4a 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
@@ -9,7 +9,7 @@
/// <summary>
/// 鏇存柊鐏厜鐘舵��
/// </summary>
- public static void UpdataState(Light uLight)
+ public static void UpdataState(Function updataTemp)
{
Application.RunOnMainThread(() =>
{
@@ -17,7 +17,10 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uLight.on_off == "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)
{
@@ -35,8 +38,9 @@
//鍥為��鍒锋柊淇℃伅浜嬩欢
actionRefresh = () => {
- btnFunctionName.Text = btnFunctionName_Out.Text = light.name;
- btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = light.GetRoomListName();
+ btnFunctionName.Text = btnFunctionName_Out.Text = function.name;
+ btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = function.GetRoomListName();
+ //function.SaveFunctionData(true);
};
}
@@ -46,8 +50,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = light.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = function.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ function.CollectFunction();
};
}
@@ -56,25 +60,50 @@
/// </summary>
void LoadSwitchEvent()
{
- btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
+ btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
- btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
+ btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
{
- light.on_off = btnSwitchIcon.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, light);
+ function.trait_on_off.curValue = btnSwitchIcon.IsSelected ? "on" : "off";
+ 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);
})
{ IsBackground = true }.Start();
};
- btnSwitch.MouseUpEventHandler += (sender, e) =>
+ btnSwitch.MouseUpEventHandler = (sender, e) =>
{
- btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- light.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, light);
+ function.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
+ 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);
})
{ 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