From 8da70e1a39328e1769b02bb1e05303916bb30eb5 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 01 二月 2021 13:55:31 +0800
Subject: [PATCH] 水阀功能
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
index 2e76d18..5dde93c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -17,7 +18,7 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.value.ToString() == "on";
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -37,6 +38,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = socketFunction.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = socketFunction.GetRoomListName();
+ socketFunction.UpdataFuncitonInfo();
};
}
@@ -46,8 +48,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = socketFunction.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- socketFunction.SaveFunctionData();
+ btnCollection.IsSelected = socketFunction.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ socketFunction.CollectFunction();
};
}
@@ -58,29 +60,29 @@
{
btnSwitchIcon.MouseUpEventHandler += (sender, e) =>
{
- btnSwitchIcon.IsSelected = !btnSwitchIcon.IsSelected;
+ btnSwitchIcon.IsSelected = btnSwitch.IsSelected = !btnSwitchIcon.IsSelected;
new System.Threading.Thread(() =>
{
- socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ socketFunction.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.socketFunction);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", socketFunction.trait_on_off.value.ToString());
- Control.SendWriteCommand(socketFunction, d);
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
};
btnSwitch.MouseUpEventHandler += (sender, e) =>
{
- btnSwitch.IsSelected = !btnSwitch.IsSelected;
+ btnSwitch.IsSelected = btnSwitchIcon.IsSelected = !btnSwitch.IsSelected;
new System.Threading.Thread(() =>
{
- socketFunction.trait_on_off.value = btnSwitch.IsSelected ? "on" : "off";
+ socketFunction.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.socketFunction);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", socketFunction.trait_on_off.value.ToString());
- Control.SendWriteCommand(socketFunction, d);
+ d.Add("on_off", socketFunction.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0