From 3db5c3218f405795dc9a2d0f6afdde8ab8ac9e73 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 23 十一月 2021 09:11:30 +0800
Subject: [PATCH] Merge branch 'WJC' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into WJC
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 4fdf8ed..7eacd06 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -2,6 +2,7 @@
using Shared;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
+using System.Collections.Generic;
namespace HDL_ON.UI
{
@@ -72,6 +73,14 @@
/// </summary>
Action actionRefresh;
#endregion
+
+
+ /// <summary>
+ /// app鑷繁鎺у埗鐨勬俯搴︽暟鍊艰褰�
+ /// </summary>
+ List<string> seltControlTemp = new List<string>();
+
+
public FloorHeatingPage(Function func)
{
bodyView = this;
@@ -138,6 +147,11 @@
// 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()
{
Gravity = Gravity.CenterHorizontal,
@@ -147,10 +161,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 +189,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