From 84115d8b6b58b4fcb7251811cb564eb5d2aa850d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 04 十一月 2022 11:55:48 +0800
Subject: [PATCH] 组合调光
---
HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/AcstSubPage.cs
index c0490ed..98e5278 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";
@@ -51,14 +52,15 @@
{
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,13 +73,16 @@
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;
@@ -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;
@@ -198,7 +203,7 @@
btnSetTempValues = new Button()
{
- Gravity = Gravity.CenterHorizontal,
+ X = Application.GetRealWidth((375 - 77 -30)/2),
Y = Application.GetRealHeight(260),
Width = Application.GetRealWidth(77),
Height = Application.GetRealHeight(90),
@@ -266,8 +271,9 @@
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 +301,6 @@
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
};
contentView.AddChidren(btnMaxValuesText);
-
-
--
Gitblit v1.8.0