From 4ad6d53e2a8dc59d99405a053ddc46f49ae7a1b3 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 14 十月 2021 11:55:51 +0800
Subject: [PATCH] 干接点新spk 兼容问题
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index f11bb02..b90cd61 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -131,12 +131,17 @@
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
IsSelected = function.collect
};
- //controlView.AddChidren(btnCollection);
+ controlView.AddChidren(btnCollection);
//2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
- {
- controlView.AddChidren(btnCollection);
- }
+ //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ //{
+ // controlView.AddChidren(btnCollection);
+ //}
+
+
+ var minValue = function.GetAttribute(FunctionAttributeKey.SetTemp).min;
+ var maxValue = function.GetAttribute(FunctionAttributeKey.SetTemp).max;
+ var progress = (int)Convert.ToDouble(function.GetAttrState(FunctionAttributeKey.SetTemp));
arcBar = new DiyArcSeekBar()
{
@@ -147,10 +152,10 @@
ProgressBarColor = CSS_Color.AuxiliaryColor1, // 0xFFFC9C04,
OfflineProgressBarColor = CSS_Color.PromptingColor2,
IsOffline = function.trait_on_off.curValue.ToString() == "off",
- MinValue = function.GetAttribute(FunctionAttributeKey.SetTemp).min,
- MaxValue = function.GetAttribute(FunctionAttributeKey.SetTemp).max,
+ MinValue = minValue,//function.GetAttribute(FunctionAttributeKey.SetTemp).min,
+ MaxValue = maxValue,// function.GetAttribute(FunctionAttributeKey.SetTemp).max,
ArcColor = CSS_Color.BackgroundColor,
- Progress = Convert.ToInt32(function.GetAttrState(FunctionAttributeKey.SetTemp)),
+ Progress = progress,
#if __IOS__
Y = Application.GetRealHeight(120+25),
Width = Application.GetRealWidth(260-40),
@@ -175,7 +180,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 56,
IsBold = true,
- Text = function.GetAttrState(FunctionAttributeKey.SetTemp),
+ Text = progress.ToString(),
TextAlignment = TextAlignment.Center,
};
controlView.AddChidren(btnTemp);
--
Gitblit v1.8.0