From d814c978efc068425c500a553cf7ec6b4f628219 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 22:27:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
index 146b7d3..e088ca9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/AC/ACPage.cs
@@ -147,12 +147,12 @@
OpenAngle = 160,
ThumbImagePath = aC.trait_on_off.curValue.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIconOn.png" : "FunctionIcon/AC/DiyThumbIcon.png",
ThumbImageHeight = Application.GetRealWidth(50),
- ProgressBarColor = CSS_Color.MainColor,//: CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
+ ProgressBarColor = CSS_Color.MainColor,
OfflineProgressBarColor = CSS_Color.PromptingColor2,
- IsOffline = aC.trait_on_off.curValue.ToString() == "on",
- MinValue = 16,
- MaxValue = 32,
- IsClickable = aC.trait_on_off.curValue.ToString() == "on",
+ IsOffline = aC.trait_on_off.curValue.ToString() == "off",
+ MinValue = aC.trait_temp.min,
+ MaxValue = aC.trait_temp.max,
+ //IsClickable = aC.trait_on_off.curValue.ToString() == "on",
ArcColor = CSS_Color.BackgroundColor,
Progress = Convert.ToInt32(aC.trait_temp.curValue),
#if __IOS__
--
Gitblit v1.8.0