From 0f2e0147e8990e913d16d99bc1b94fb6bc53abd7 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期四, 03 十二月 2020 15:35:42 +0800
Subject: [PATCH] 2020-12-03-1
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
index 4233d0b..bbbbb48 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/FanPageBLL.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.DriverLayer;
using HDL_ON.Entity;
using Shared;
@@ -17,8 +18,8 @@
{
if (bodyView == null)
return;
- bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.on_off == "on";
- bodyView.barGradualChange.ProgressBarColor = uFan.on_off == "on" ? CSS.CSS_Color.MainColor : CSS.CSS_Color.PromptingColor2;
+ bodyView.btnSwitch.IsSelected = bodyView.btnSwitchIcon.IsSelected = uFan.trait_on_off.curValue.ToString() == "on";
+ bodyView.barGradualChange.ProgressBarColor = uFan.trait_on_off.curValue.ToString() == "on" ? CSS.CSS_Color.MainColor : CSS.CSS_Color.PromptingColor2;
bodyView.barGradualChange.Progress = uFan.openLevel;
}
catch (Exception ex)
@@ -39,6 +40,7 @@
actionRefresh = () => {
btnFunctionName.Text = btnFunctionName_Out.Text = fan.name;
btnFromFloor_Out.Text = btnFromFoorAndRoom.Text = fan.GetRoomListName();
+ fan.SaveFunctionData();
};
}
@@ -48,8 +50,8 @@
void LoadCollectionEvent()
{
btnCollection.MouseUpEventHandler += (sender, e) => {
- btnCollection.IsSelected = fan.collection = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- DB_ResidenceData.residenceData.SaveResidenceData();
+ btnCollection.IsSelected = fan.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
+ fan.SaveFunctionData();
};
}
@@ -64,11 +66,11 @@
new System.Threading.Thread(() =>
{
- fan.on_off = btnSwitch.IsSelected ? "on" : "off";
+ fan.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.fan);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", fan.on_off.ToString());
- Control.SendWriteCommand(fan, d);
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
};
@@ -78,11 +80,11 @@
new System.Threading.Thread(() =>
{
- fan.on_off = btnSwitch.IsSelected ? "on" : "off";
+ fan.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.fan);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", fan.on_off.ToString());
- Control.SendWriteCommand(fan, d);
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
};
@@ -91,11 +93,11 @@
fan.openLevel = e;
new System.Threading.Thread(() =>
{
- fan.on_off = btnSwitch.IsSelected ? "on" : "off";
+ fan.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
//Control.Send(CommandType_A.write, this.fan);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
- d.Add("on_off", fan.on_off.ToString());
- Control.SendWriteCommand(fan, d);
+ d.Add("on_off", fan.trait_on_off.curValue.ToString());
+ Control.Ins.SendWriteCommand(fan, d);
})
{ IsBackground = true }.Start();
};
--
Gitblit v1.8.0