From 2ae36ddb40d28c62b64a2fdd4c3033e7d65d5cfb Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 04 三月 2021 15:20:29 +0800
Subject: [PATCH] 2021-0304-1
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index eacbce9..8a716e8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -22,13 +22,10 @@
bodyView.btnTemp.Text = uFh.trait_temp.curValue.ToString();
bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(uFh.trait_IndoorTemp.curValue)) + "掳C";
bodyView.btnMode.UnSelectedImagePath = uFh.curModeImage;
- if (uFh.refreshTime.AddMilliseconds(1000) < DateTime.Now)
- {
- bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uFh.trait_temp.curValue));
- }
+ bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(uFh.trait_temp.curValue));
if (uFh.trait_on_off.curValue.ToString() == "on")
{
- bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
bodyView.btnSwitch.IsSelected = true;
bodyView.arcBar.IsOffline = false;
}
@@ -68,7 +65,7 @@
btnCollection.MouseUpEventHandler += (sender, e) =>
{
btnCollection.IsSelected = fh.collect = btnCollection_Out.IsSelected = !btnCollection.IsSelected;
- fh.SaveFunctionData(true);
+ fh.CollectFunction();
};
}
@@ -79,6 +76,11 @@
{
btnMinus.MouseUpEventHandler = (sender, e) =>
{
+ if(fh.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
+
var temp = Convert.ToInt32(fh.trait_temp.curValue);
if (temp < Convert.ToInt32(fh.trait_temp.min))
{
@@ -94,6 +96,10 @@
};
btnPlus.MouseUpEventHandler = (sender, e) =>
{
+ if (fh.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
var temp = Convert.ToInt32(fh.trait_temp.curValue);
if (temp > Convert.ToInt32(fh.trait_temp.max))
{
@@ -130,6 +136,10 @@
{
btnMode.MouseUpEventHandler = (sender, e) =>
{
+ if (fh.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeModeView();
};
@@ -140,7 +150,7 @@
if (fh.trait_on_off.curValue.ToString() == "on")
{
//arcBar.ProgressBarColor = CSS_Color.MainColor;
- arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ arcBar.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
btnSwitch.IsSelected = true;
arcBar.IsOffline = false;
}
@@ -172,6 +182,7 @@
{
btn1.IsSelected = btn2.IsSelected = true;
fh.trait_mode.curValue = curMode;
+ btnMode.UnSelectedImagePath = btn1.SelectedImagePath;
byte pro = 6;
fh.modeTemp.TryGetValue(curMode, out pro);
arcBar.Progress = pro;
--
Gitblit v1.8.0