From 4a9318077bd095fbc7c57c593e5ca8185603dac4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 19 十二月 2020 18:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 99eff0f..b0587b9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -143,7 +143,9 @@
OpenAngle = 160,
ThumbImagePath = fh.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = fh.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
+ ProgressBarColor = CSS_Color.MainColor ,//: CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
+ OfflineProgressBarColor = CSS_Color.PromptingColor2,
+ IsOffline = fh.trait_on_off.curValue.ToString() == "on",
MinValue = 5,
MaxValue = 35,
IsClickable = fh.trait_on_off.curValue.ToString() == "on",
--
Gitblit v1.8.0