From e53a1951d6aa07ad22aad9816da4703496fcbccd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 十一月 2020 14:27:16 +0800
Subject: [PATCH] 1127最新合并代码，合并嘉乐更新
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPageBLL.cs
index c2d17d5..d64f304 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.on_off == "on";
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.curValue.ToString() == "on";
}
catch (Exception ex)
{
@@ -47,7 +48,7 @@
{
btnCollection.MouseUpEventHandler += (sender, e) => {
btnCollection.IsSelected = socketFunction.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ socketFunction.SaveFunctionData();
};
}
@@ -62,8 +63,11 @@
new System.Threading.Thread(() =>
{
- socketFunction.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, this.socketFunction);
+ 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.curValue.ToString());
+ Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
};
@@ -73,8 +77,11 @@
new System.Threading.Thread(() =>
{
- socketFunction.on_off = btnSwitch.IsSelected ? "on" : "off";
- Control.Send(CommandType_A.write, this.socketFunction);
+ 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.curValue.ToString());
+ Control.Ins.SendWriteCommand(socketFunction, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0