From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index 994fd7e..95ab2fa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,15 +19,24 @@
{
return;
}
- bodyView.arcBar.ProgressBarColor = uFh.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2;
- bodyView.arcBar.ThumbImagePath = uFh.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png";
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;
- bodyView.btnSwitch.IsSelected = uFh.trait_on_off.curValue.ToString() == "on";
if (uFh.refreshTime.AddMilliseconds(1000) < DateTime.Now)
{
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.btnSwitch.IsSelected = true;
+ bodyView.arcBar.IsOffline = false;
+ }
+ else
+ {
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ bodyView.btnSwitch.IsBold = false;
+ bodyView.arcBar.IsOffline = true;
}
});
}
@@ -70,6 +79,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))
{
@@ -77,7 +91,7 @@
}
temp--;
arcBar.Progress = temp;
- fh.trait_temp.curValue = temp;
+ fh.trait_temp.curValue = temp.ToString();
btnTemp.Text = temp.ToString();
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -85,6 +99,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))
{
@@ -93,7 +111,7 @@
temp++;
arcBar.Progress = temp;
btnTemp.Text = temp.ToString();
- fh.trait_temp.curValue = temp;
+ fh.trait_temp.curValue = temp.ToString();
//Control.Send(CommandType_A.write, fh);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.SetTemp, temp.ToString());
@@ -101,7 +119,7 @@
};
arcBar.OnStopTrackingTouchEvent = (sender, e) =>
{
- fh.trait_temp.curValue = arcBar.Progress;
+ fh.trait_temp.curValue = arcBar.Progress.ToString();
btnTemp.Text = fh.trait_temp.curValue.ToString();
//Control.Send(CommandType_A.write, fh);
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
@@ -110,7 +128,7 @@
};
arcBar.OnProgressChangedEvent = (sender, e) =>
{
- fh.trait_temp.curValue = e;
+ fh.trait_temp.curValue = e.ToString();
btnTemp.Text = fh.trait_temp.curValue.ToString();
};
}
@@ -121,6 +139,10 @@
{
btnMode.MouseUpEventHandler = (sender, e) =>
{
+ if (fh.trait_on_off.curValue.ToString() == "off")
+ {
+ return;
+ }
LoadDiv_ChangeModeView();
};
@@ -128,10 +150,24 @@
{
btnSwitch.IsSelected = !btnSwitch.IsSelected;
fh.trait_on_off.curValue = btnSwitch.IsSelected ? "on" : "off";
- //Control.Send(CommandType_A.write, fh);
+ if (fh.trait_on_off.curValue.ToString() == "on")
+ {
+ //arcBar.ProgressBarColor = CSS_Color.MainColor;
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ btnSwitch.IsSelected = true;
+ arcBar.IsOffline = false;
+ }
+ else
+ {
+ //arcBar.ProgressBarColor = CSS_Color.PromptingColor2;
+ arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ btnSwitch.IsBold = false;
+ arcBar.IsOffline = true;
+ }
System.Collections.Generic.Dictionary<string, string> d = new System.Collections.Generic.Dictionary<string, string>();
d.Add(FunctionAttributeKey.OnOff, fh.trait_on_off.curValue.ToString());
Control.Ins.SendWriteCommand(fh, d);
+
};
}
--
Gitblit v1.8.0