From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Light/RelayPageBLL.cs
index 28f1f7e..089c4e8 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,7 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uLight.on_off == "on";
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = updataTemp.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -35,8 +35,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 +47,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,23 +57,28 @@
/// </summary>
void LoadSwitchEvent()
{
- btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
+ btnSwitchIcon.MouseUpEventHandler = (sender, e) =>
{
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) =>
{
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);
+ //Control.Send(CommandType_A.write, function);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0