From 88b9c9dbae4f0f28529cd3b3ffe53cd26f19f738 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期日, 30 七月 2023 21:55:50 +0800
Subject: [PATCH] Merge branch 'wxr-2.1' into Dev-Branch
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs | 2
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs | 138 ++++++++++++++++++++++++++++++++++++----------
2 files changed, 109 insertions(+), 31 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
index bdbc4c5..f0dfb5c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
@@ -119,6 +119,9 @@
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.month,
+ SelectedBackgroundColor = 0x1F5C62FE,
+ BackgroundColor = 0x00000000,
+ IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
};
@@ -133,6 +136,9 @@
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.Years,
+ SelectedBackgroundColor = 0x1F5C62FE,
+ BackgroundColor = 0x00000000,
+ IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
};
@@ -147,51 +153,123 @@
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextID = StringId.Total,
+ SelectedBackgroundColor = 0x1F5C62FE,
+ BackgroundColor = 0x00000000,
+ IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Total);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+
+
+ btnShowHistroyData_Total.MouseUpEventHandler = (sender, e) =>
+ {
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Month.IsSelected = false;
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Month.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Month.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Year.IsSelected = false;
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Year.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Year.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Day.IsSelected = false;
+ btnShowHistroyData_Day.BorderWidth = 1;
+ btnShowHistroyData_Day.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Day.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
+ };
btnShowHistroyData_Day.MouseUpEventHandler = (sender, e) =>
{
- //showDataTypeView.BackgroundImagePath = "FunctionIcon/EnvironmentalScience/SensorHistoryBg1.png";
- //btnShowHistroyData_Day.IsSelected = true;
- //btnShowHistroyData_Year.IsSelected = false;
- //btnShowHistroyData_Month.IsSelected = false;
- //curQueryType = "hour";
- //brokenLine.YvalueText = "";
- //foreach (var enery in queryList)
- //{
- // LoadMothed_GetHistoryData(enery, false);
- //}
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Month.IsSelected = false;
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Month.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Month.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Year.IsSelected = false;
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Year.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Year.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Total.IsSelected = false;
+ btnShowHistroyData_Total.BorderWidth = 1;
+ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Total.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
};
btnShowHistroyData_Month.MouseUpEventHandler = (sender, e) =>
{
- //showDataTypeView.BackgroundImagePath = "FunctionIcon/EnvironmentalScience/SensorHistoryBg2.png";
- //btnShowHistroyData_Day.IsSelected = false;
- //btnShowHistroyData_Year.IsSelected = false;
- //btnShowHistroyData_Month.IsSelected = true;
- //curQueryType = "week";
- //brokenLine.YvalueText = "";
- //foreach (var enery in queryList)
- //{
- // LoadMothed_GetHistoryData(enery, false);
- //}
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Day.IsSelected = false;
+ btnShowHistroyData_Day.BorderWidth = 1;
+ btnShowHistroyData_Day.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Day.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Year.IsSelected = false;
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Year.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Year.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Total.IsSelected = false;
+ btnShowHistroyData_Total.BorderWidth = 1;
+ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Total.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
};
+
btnShowHistroyData_Year.MouseUpEventHandler = (sender, e) =>
{
- //showDataTypeView.BackgroundImagePath = "FunctionIcon/EnvironmentalScience/SensorHistoryBg3.png";
- //btnShowHistroyData_Day.IsSelected = false;
- //btnShowHistroyData_Year.IsSelected = true;
- //btnShowHistroyData_Month.IsSelected = false;
- //curQueryType = "month";
- //brokenLine.YvalueText = "";
- //foreach (var enery in queryList)
- //{
- // LoadMothed_GetHistoryData(enery, false);
- //}
+ (sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
+ (sender as Button).BackgroundColor = 0x1F5C62FE;
+ (sender as Button).BorderColor = CSS_Color.MainColor;
+ (sender as Button).BorderWidth = 2;
+ (sender as Button).IsSelected = true;
+
+ btnShowHistroyData_Month.IsSelected = false;
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Month.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Month.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Day.IsSelected = false;
+ btnShowHistroyData_Day.BorderWidth = 1;
+ btnShowHistroyData_Day.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Day.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
+
+ btnShowHistroyData_Total.IsSelected = false;
+ btnShowHistroyData_Total.BorderWidth = 1;
+ btnShowHistroyData_Total.BorderColor = CSS_Color.PromptingColor1;
+ btnShowHistroyData_Total.BackgroundColor = 0x00000000;
+ btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
};
#endregion
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
index 1baeb5b..4bbffd9 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3Page.cs
@@ -153,7 +153,7 @@
TextAlignment = TextAlignment.Center,
TextSize = CSS_FontSize.TextFontSize,
};
- controlView.AddChidren(btnRunStatus); //鐘舵�佹棤娉曟祴璇曪紝鏆傛椂闅愯棌--2021-10-14 13:58:48 钁ｆ辰鏂�
+ controlView.AddChidren(btnRunStatus);
UpdataRunStatus();
}
--
Gitblit v1.8.0