From 1a13c963a5fb8cad92bf03667e411f46d6a6a843 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 15:10:33 +0800
Subject: [PATCH] Revert "Merge branch 'tzy' into NewFilePath"
---
HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs | 40 +++++++++++++++++++++++++---------------
1 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
index 49307d5..0b35fe5 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/FoolHeating/FloorHeatingPage.cs
@@ -128,22 +128,27 @@
Height = Application.GetMinRealAverage(40),
SelectedImagePath = "Collection/CollectionIcon.png",
UnSelectedImagePath = "Collection/CollectionGrayIcon.png",
- IsSelected = fh.collection
+ IsSelected = fh.collect
};
- controlView.AddChidren(btnCollection);
+ //controlView.AddChidren(btnCollection);
+ //2020-12-16 濡傛灉鏄垚鍛橀殣钘忔敹钘忓姛鑳�
+ if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ {
+ controlView.AddChidren(btnCollection);
+ }
arcBar = new DiyArcSeekBar()
{
Gravity = Gravity.CenterHorizontal,
OpenAngle = 160,
- ThumbImagePath = fh.trait_on_off.value.ToString() == "on" ? "FunctionIcon/AC/DiyThumbIcon2On.png" : "FunctionIcon/AC/DiyThumbIcon.png",
+ 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.value.ToString() == "on" ? 0xFFFC9C04 : CSS_Color.PromptingColor2,
+ ProgressBarColor = fh.trait_on_off.curValue.ToString() == "on" ? CSS_Color.MainColor : CSS_Color.PromptingColor2, // 0xFFFC9C04 : CSS_Color.PromptingColor2,
MinValue = 5,
MaxValue = 35,
- IsClickable = fh.trait_on_off.value.ToString() == "on",
+ IsClickable = fh.trait_on_off.curValue.ToString() == "on",
ArcColor = CSS_Color.BackgroundColor,
- Progress = Convert.ToInt32(fh.curTemp),
+ Progress = Convert.ToInt32(fh.trait_temp.curValue),
#if __IOS__
Y = Application.GetRealHeight(120+25),
Width = Application.GetRealWidth(260-40),
@@ -168,7 +173,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = 56,
IsBold = true,
- Text = fh.curTemp.ToString(),
+ Text = fh.trait_temp.curValue.ToString(),
TextAlignment = TextAlignment.Center,
};
controlView.AddChidren(btnTemp);
@@ -237,12 +242,17 @@
Height = Application.GetRealWidth(40),
UnSelectedImagePath = "Public/PowerClose.png",
SelectedImagePath = "Public/PowerOpen.png",
- IsSelected = fh.trait_on_off.value.ToString() == "on"
+ IsSelected = fh.trait_on_off.curValue.ToString() == "on"
};
controlView.AddChidren(btnSwitch);
LoadEventList();
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(fh, actionRefresh);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.FloorHeating)).LoadTopView_FunctionTop(fh, actionRefresh);
+ new System.Threading.Thread(() =>
+ {
+ DriverLayer.Control.Ins.SendReadCommand(fh);
+ })
+ { IsBackground = true }.Start();
}
/// <summary>
/// 鍔犺浇淇敼妯″紡鍖哄煙
@@ -294,28 +304,28 @@
};
modeChangeView.AddChidren(btnLine);
- foreach (var m in fh.trait_mode.value_key)
+ foreach (var m in fh.trait_mode.value)
{
Button btnModeIcon = new Button()
{
X = btnTitle.X,
- Y = Application.GetRealHeight(44 * (fh.trait_mode.value_key.IndexOf(m) + 1) + 10 + 8),
+ Y = Application.GetRealHeight(44 * (fh.trait_mode.value.IndexOf(m) + 1) + 10 + 8),
Width = Application.GetRealWidth(24),
Height = Application.GetRealWidth(24),
- IsSelected = fh.trait_mode.value.ToString() == m,
+ IsSelected = fh.trait_mode.curValue.ToString() == m,
};
modeChangeView.AddChidren(btnModeIcon);
Button btnModeText = new Button()
{
X = Application.GetRealWidth(12) + btnModeIcon.Right,
- Y = Application.GetRealHeight(44 * (fh.trait_mode.value_key.IndexOf(m) + 1) + 8),
+ Y = Application.GetRealHeight(44 * (fh.trait_mode.value.IndexOf(m) + 1) + 8),
Height = Application.GetRealHeight(44),
Width = Application.GetRealWidth(70),
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
SelectedTextColor = CSS_Color.MainColor,
- IsSelected = fh.trait_mode.value.ToString() == m,
+ IsSelected = fh.trait_mode.curValue.ToString() == m,
};
modeChangeView.AddChidren(btnModeText);
@@ -348,7 +358,7 @@
break;
}
- if (fh.trait_mode.value_key.IndexOf(m) < fh.trait_mode.value_key.Count - 1)
+ if (fh.trait_mode.value.IndexOf(m) < fh.trait_mode.value.Count - 1)
{
modeChangeView.AddChidren(new Button()
{
--
Gitblit v1.8.0