From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十一月 2022 11:27:38 +0800
Subject: [PATCH] 金茂科技系统更新
---
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs | 63 +++++++++++++++++--------------
1 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
index f6a5fbd..f004fbf 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
@@ -21,6 +21,7 @@
Function function;
uint curColor;
+ string colorString;
string imageFolder = "blue";
@@ -46,19 +47,21 @@
//int progress = 0;
//int.TryParse(temp.GetAttrState(AcstSub_AttrEnum.set_temp.ToString()), out progress);
- bodyView.tempBar.Progress = setTempValue - 16;
+ if (bodyView.tempBar.Progress != setTempValue - 16)
+ bodyView.tempBar.Progress = setTempValue - 16;
if(temp.trait_on_off.curValue.ToString() == "on")
{
bodyView.btnPowerControl.IsSelected = true;
bodyView.tempBar.ProgressBarColor = bodyView.curColor;
- bodyView.tempBar.IsOffline = false;
+ //bodyView.tempBar.IsClickable = function.trait_on_off.curValue.ToString() == "off",
+ //bodyView.tempBar.IsOffline = false;
}
else
{
bodyView.btnPowerControl.IsSelected = false;
bodyView.tempBar.ProgressBarColor = CSS_Color.DividingLineColor;
- bodyView.tempBar.IsOffline = true;
+ //bodyView.tempBar.IsOffline = true;
}
});
@@ -71,21 +74,24 @@
switch (imageFolder)
{
case "blue":
- curColor = CSS.CSS_Color.MainColor;
+ curColor = CSS_Color.MainColor;
+ colorString = "#4484F4";
break;
case "orange":
curColor = 0xFFFFB848;
+ colorString = "#FFB848";
break;
case "purple":
curColor = 0xFF9175F3;
+ colorString = "#9175F3";
break;
}
bodyView = this;
}
- public void LoadPage()
+ public void LoadPage(Action action)
{
- new TopViewDiv(bodyView, function.GetRoomListName()).LoadTopView();
+ new TopViewDiv(bodyView, function.name).LoadTopView_FunctionTop(function,action);
var contentView = new FrameLayout()
{
@@ -126,9 +132,9 @@
TextSize = 30,
TextColor = CSS.CSS_Color.FirstLevelTitleColor,
TextAlignment = TextAlignment.TopRight,
- Text = "---",
+ Text = function.GetAttrState(AcstSub_AttrEnum.room_temp.ToString(),"---"),
};
- btnTempValues.Text = function.GetAttrState(AcstSub_AttrEnum.room_temp.ToString());
+ //btnTempValues.Text = function.GetAttrState(AcstSub_AttrEnum.room_temp.ToString());
btnTempValues.Width = btnTempValues.GetTextWidth();
btnTempValues.Gravity = Gravity.CenterHorizontal;
tempValuesView.AddChidren(btnTempValues);
@@ -162,10 +168,9 @@
IsBold = true,
TextSize = 30,
TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- Text = "---",
+ Text = function.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString(),"---"),
TextAlignment = TextAlignment.TopRight,
};
- btnHumiValues.Text = function.GetAttrState(AcstSub_AttrEnum.room_humidity.ToString());
btnHumiValues.Width = btnTempValues.GetTextWidth();
btnHumiValues.Gravity = Gravity.CenterHorizontal;
humiValuesView.AddChidren(btnHumiValues);
@@ -184,7 +189,7 @@
EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
- var page = new AcstSubHistoryPage(function);
+ var page = new AcstSubHistoryPage(function, colorString);
MainPage.BasePageView.AddChidren(page);
page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -196,25 +201,26 @@
#endregion
- btnSetTempValues = new Button()
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(260),
- Width = Application.GetRealWidth(77),
- Height = Application.GetRealHeight(90),
- TextAlignment = TextAlignment.TopRight,
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- IsBold = true,
- TextSize = 60,
- Text = function.GetAttrState(AcstSub_AttrEnum.set_temp.ToString(), "--")
- };
- contentView.AddChidren(btnSetTempValues);
int setTempValue = 0;
+ string setTempStr = "--";
double dd = 0;
double.TryParse(function.GetAttrState(AcstSub_AttrEnum.set_temp.ToString(), "--"), out dd);
setTempValue = Convert.ToInt32(dd);
if (setTempValue != 0)
- btnSetTempValues.Text = setTempValue.ToString();
+ setTempStr = setTempValue.ToString();
+ btnSetTempValues = new Button()
+ {
+ X = Application.GetRealWidth((375 - 77 -30)/2),
+ Y = Application.GetRealHeight(260),
+ Width = Application.GetRealWidth(73),
+ Height = Application.GetRealHeight(90),
+ TextAlignment = TextAlignment.TopCenter,
+ TextColor = CSS.CSS_Color.FirstLevelTitleColor,
+ IsBold = true,
+ TextSize = 60,
+ Text = setTempStr
+ };
+ contentView.AddChidren(btnSetTempValues);
//bodyView.btnSetTempValues.Width = bodyView.btnSetTempValues.GetTextWidth() + Application.GetRealWidth(10);
@@ -262,12 +268,13 @@
ThumbImageHeight = Application.GetRealHeight(51),
ProgressBarColor = function.trait_on_off.curValue.ToString() == "on" ? curColor : CSS_Color.DividingLineColor,
MaxValue = 14,
- Progress = progress + 16,
+ Progress = progress - 16,
SeekBarPadding = Application.GetRealWidth(20),
IsProgressTextShow = false,
ProgressChangeDelayTime = 0,
+ //IsClickable = function.trait_on_off.curValue.ToString() == "off",
//Enable = function.trait_on_off.curValue.ToString() == "off",
- //IsOffline = function.trait_on_off.curValue.ToString() == "off",
+ //IsOffline = true,// function.trait_on_off.curValue.ToString() == "off",
};
contentView.AddChidren(tempBar);
tempBar.OnProgressChangedEvent = (sender, e) => {
@@ -295,8 +302,6 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
};
contentView.AddChidren(btnMaxValuesText);
-
-
--
Gitblit v1.8.0