From 41f9c8837b0551c68f8fd798c06951fa716b7ab8 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 11 一月 2021 14:05:29 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
index b50a962..8a716e8 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPageBLL.cs
@@ -25,7 +25,7 @@
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;
}
@@ -150,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;
}
@@ -182,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