From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 27 六月 2022 10:54:32 +0800
Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 7eacd06..04f939c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -84,6 +84,15 @@
public FloorHeatingPage(Function func)
{
bodyView = this;
+ var tempAttr = func.GetAttribute(FunctionAttributeKey.SetTemp);
+ if (tempAttr != null)
+ {
+ if(tempAttr.min == 0 && tempAttr.max == 0)
+ {
+ tempAttr.min = 16;
+ tempAttr.max = 30;
+ }
+ }
function = func;
}
@@ -150,7 +159,10 @@
var minValue = function.GetAttribute(FunctionAttributeKey.SetTemp).min;
var maxValue = function.GetAttribute(FunctionAttributeKey.SetTemp).max;
- var progress = (int)Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp));
+ double progressDouble = 0;
+ var ddd = function.GetAttrState(FunctionAttributeKey.SetTemp);
+ double.TryParse(ddd,out progressDouble);
+ int progress = (int)progressDouble;
arcBar = new DiyArcSeekBar()
{
--
Gitblit v1.8.0