From cbc156bc38d8b8eae7aef60cb186ab2b52fa701f Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期二, 16 七月 2024 13:59:56 +0800
Subject: [PATCH] 增加全部挂断
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
index 15ac8b0..3f900c4 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3EnergyPage.cs
@@ -93,6 +93,7 @@
BackgroundColor = 0x1F5C62FE,
BorderColor = CSS_Color.MainColor,
BorderWidth = 2,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Day);
btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
@@ -112,8 +113,11 @@
IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Month);
+ btnShowHistroyData_Month.BorderWidth = 1;
+ btnShowHistroyData_Month.BorderColor = CSS_Color.PromptingColor1;
var btnShowHistroyData_Year = new Button()
{
@@ -129,8 +133,11 @@
IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Year);
+ btnShowHistroyData_Year.BorderWidth = 1;
+ btnShowHistroyData_Year.BorderColor = CSS_Color.PromptingColor1;
var btnShowHistroyData_Total = new Button()
{
@@ -146,6 +153,7 @@
IsSelected = false,
BorderWidth = 1,
BorderColor = CSS_Color.PromptingColor1,
+ Radius = 1,
};
showDataTypeView.AddChidren(btnShowHistroyData_Total);
btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
@@ -157,8 +165,6 @@
{
return;
}
- curQueryType = "total";
-
(sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
(sender as Button).BackgroundColor = 0x1F5C62FE;
(sender as Button).BorderColor = CSS_Color.MainColor;
@@ -183,7 +189,11 @@
btnShowHistroyData_Day.BackgroundColor = 0x00000000;
btnShowHistroyData_Day.SelectedBackgroundColor = 0x00000000;
-
+
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
};
btnShowHistroyData_Day.MouseUpEventHandler = (sender, e) =>
@@ -216,6 +226,10 @@
btnShowHistroyData_Total.BackgroundColor = 0x00000000;
btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
curQueryType = "hour";
brokenLine.YvalueText = "";
LoadMothed_GetHistoryData();
@@ -251,6 +265,10 @@
btnShowHistroyData_Total.BackgroundColor = 0x00000000;
btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
curQueryType = "month";
brokenLine.YvalueText = "";
LoadMothed_GetHistoryData();
@@ -262,7 +280,6 @@
{
return;
}
-
(sender as Button).SelectedBackgroundColor = 0x1F5C62FE;
(sender as Button).BackgroundColor = 0x1F5C62FE;
(sender as Button).BorderColor = CSS_Color.MainColor;
@@ -287,6 +304,10 @@
btnShowHistroyData_Total.BackgroundColor = 0x00000000;
btnShowHistroyData_Total.SelectedBackgroundColor = 0x00000000;
+#if __IOS__
+ btnShowHistroyData_Day.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerBottomLeft);
+ btnShowHistroyData_Total.SetCornerWithSameRadius((uint)Application.GetRealHeight(6), HDLUtils.RectCornerBottomRight | HDLUtils.RectCornerTopRight);
+#endif
curQueryType = "year_month";
brokenLine.YvalueText = "";
@@ -452,19 +473,21 @@
btnTitlea.MouseUpEventHandler = (sender, e) => {
var skipView = new AirSwitchP3SubloopEnergyPage(device,FunctionAttributeKey.ElectricityA);
MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage();
+ skipView.LoadPage(StringId.RealTimeElectricityConsumptionDataOfPhaseA);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnTitlea.MouseUpEventHandler = (sender, e) => {
+
+ btnTitleb.MouseUpEventHandler = (sender, e) => {
var skipView = new AirSwitchP3SubloopEnergyPage(device, FunctionAttributeKey.ElectricityB);
MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage();
+ skipView.LoadPage(StringId.RealTimeElectricityConsumptionDataOfPhaseB);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- btnTitlea.MouseUpEventHandler = (sender, e) => {
+
+ btnTitlec.MouseUpEventHandler = (sender, e) => {
var skipView = new AirSwitchP3SubloopEnergyPage(device, FunctionAttributeKey.ElectricityC);
MainPage.BasePageView.AddChidren(skipView);
- skipView.LoadPage();
+ skipView.LoadPage(StringId.RealTimeElectricityConsumptionDataOfPhaseC);
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
@@ -585,8 +608,8 @@
if (revertObj.Code == StateCode.SUCCESS)
{
var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString());
- if (revertData == null || revertData.Count == 0 || true) {
#if DEBUG
+ if (revertData == null || revertData.Count == 0) {
List<string> vs = new List<string>() {
"1","2","3","4",
"5","6","7","8",
@@ -617,9 +640,9 @@
}
device.SetAttrState("ydata", brokenLine.InitYdataText2(device.name, revertData, "#5C62FE", curQueryType == "year_month") + ", ");
+ }
+ else
#endif
- }
- else
{
List<string> vs = new List<string>();
if (brokenLine.YvalueText == "")
--
Gitblit v1.8.0