From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index d0a5660..950bbd0 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -19,22 +19,47 @@
{
return;
}
- bodyView.btnTemp.Text = updateTemp.GetAttrState(FunctionAttributeKey.SetTemp);
- bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.IndoorTemp))) + "掳C";
+ var outinTemp = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp)));
+ bodyView.btnTemp.Text = outinTemp.ToString();
+ bodyView.btnIndoorTemp.Text = Language.StringByID(StringId.IndoorTemp) + Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.RoomTemp))) + "掳C";
bodyView.btnMode.UnSelectedImagePath = bodyView.fhTemp.GetModeIconPath(updateTemp.GetAttrState(FunctionAttributeKey.Mode));
- bodyView.arcBar.Progress = Convert.ToInt32(Convert.ToDouble(updateTemp.GetAttrState(FunctionAttributeKey.SetTemp)));
+ bodyView.arcBar.Progress = outinTemp;
+ //if (updateTemp.trait_on_off.curValue.ToString() == "on")
+ //{
+ // bodyView.arcBar.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
+ // bodyView.btnSwitch.IsSelected = true;
+ // bodyView.arcBar.IsOffline = false;
+ //}
+ //else
+ //{
+ // bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
+ // bodyView.btnSwitch.IsSelected = false;
+ // bodyView.arcBar.IsOffline = true;
+ //}
+
if (updateTemp.trait_on_off.curValue.ToString() == "on")
{
- bodyView.arcBar.ThumbImagePath = "FunctionIcon/FloorHeating/DiyThumbIconOn.png";
- bodyView.btnSwitch.IsSelected = true;
bodyView.arcBar.IsOffline = false;
+ bodyView.btnSwitch.IsSelected = true;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIconOn.png";
+ if (updateTemp.GetAttrState(FunctionAttributeKey.Mode) == "fan")
+ {
+ bodyView.arcBar.IsClickable = false;
+ }
+ else
+ {
+ bodyView.arcBar.IsClickable = true;
+ }
}
else
{
- bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
- bodyView.btnSwitch.IsBold = false;
bodyView.arcBar.IsOffline = true;
+ bodyView.btnSwitch.IsSelected = false;
+ bodyView.arcBar.IsClickable = false;
+ bodyView.arcBar.ThumbImagePath = "FunctionIcon/AC/DiyThumbIcon.png";
}
+
+
});
}
catch (Exception ex)
@@ -100,8 +125,8 @@
{
return;
}
- var temp = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.SetTemp));
- if (temp > Convert.ToInt32(function.GetAttribute(FunctionAttributeKey.SetTemp).max))
+ var temp =(int) Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp));
+ if (temp > Convert.ToDouble(function.GetAttribute(FunctionAttributeKey.SetTemp).max))
{
return;
}
@@ -124,7 +149,7 @@
arcBar.OnProgressChangedEvent = (sender, e) =>
{
function.SetAttrState(FunctionAttributeKey.SetTemp, e);
- btnTemp.Text = function.GetAttrState(FunctionAttributeKey.SetTemp);
+ btnTemp.Text = Convert.ToDouble( function.GetAttrState(FunctionAttributeKey.SetTemp)).ToString();
};
}
/// <summary>
--
Gitblit v1.8.0