From eeb6f0b4bf0a81834325638401d5fa404e53db93 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期四, 05 九月 2024 19:41:45 +0800 Subject: [PATCH] 金茂光伏储能,热水器;自动化,空调,地暖步进判断 --- HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs | 290 +++++++++++++++++++++++---------------------------------- 1 files changed, 117 insertions(+), 173 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs index b1d60f1..f09e8d6 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/WetarHeaterJinmaoHistoryPage.cs @@ -215,40 +215,40 @@ tempEchartOption = new EchartsOption_Histogram(); tempEchartOption.xTitle = "鏃堕棿"; tempEchartOption.yTitle = "娓╁害锛堚剝锛�"; - tempEchartOption.InitXdataText(new List<string>() - { - "21","22","23","24","25","26","26","27","28","29", - "21","22","23","24","25","26","26","27","28","29", - "21","22","23","24" - }); - tempEchartOption.InitYdataText(new List<EnvironmentalSensorHistor>() { - new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" }, - new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" }, - new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "41" }, - new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "31" }, - new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "21" }, - new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" }, - new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" }, - new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" }, - new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "15", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "16", fieldValue= "22" }, - new EnvironmentalSensorHistor{ fieldName = "17", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "18", fieldValue= "21" }, - new EnvironmentalSensorHistor{ fieldName = "19", fieldValue= "41" }, - new EnvironmentalSensorHistor{ fieldName = "20", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "21", fieldValue= "31" }, - new EnvironmentalSensorHistor{ fieldName = "22", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "23", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "24", fieldValue= "21" }, - }); - var ddd = tempEchartOption.InitOption(); - infoView1_EchartsView.ShowWithOption(ddd); + //tempEchartOption.InitXdataText(new List<string>() + //{ + // "21","22","23","24","25","26","26","27","28","29", + // "21","22","23","24","25","26","26","27","28","29", + // "21","22","23","24" + //}); + //tempEchartOption.InitYdataText(new List<EnvironmentalSensorHistor>() { + // new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" }, + // new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" }, + // new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "41" }, + // new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "31" }, + // new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "21" }, + // new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" }, + // new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" }, + // new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" }, + // new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "15", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "16", fieldValue= "22" }, + // new EnvironmentalSensorHistor{ fieldName = "17", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "18", fieldValue= "21" }, + // new EnvironmentalSensorHistor{ fieldName = "19", fieldValue= "41" }, + // new EnvironmentalSensorHistor{ fieldName = "20", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "21", fieldValue= "31" }, + // new EnvironmentalSensorHistor{ fieldName = "22", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "23", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "24", fieldValue= "21" }, + //}); + //var ddd = tempEchartOption.InitOption(); + //infoView1_EchartsView.ShowWithOption(ddd); infoView1.AddChidren(new Button() { @@ -420,39 +420,39 @@ echartOption2 = new EchartsOption_Histogram(); echartOption2.xTitle = "鏃堕棿"; echartOption2.yTitle = "鐢ㄦ按閲忥紙t锛�"; - echartOption2.InitXdataText(new List<string>() - { - "21","22","23","24","25","26","26","27","28","29", - "21","22","23","24","25","26","26","27","28","29", - "21","22","23","24" - }); - echartOption2.InitYdataText(new List<EnvironmentalSensorHistor>() { - new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" }, - new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" }, - new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "41" }, - new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "31" }, - new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "21" }, - new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" }, - new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" }, - new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" }, - new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "15", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "16", fieldValue= "22" }, - new EnvironmentalSensorHistor{ fieldName = "17", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "18", fieldValue= "21" }, - new EnvironmentalSensorHistor{ fieldName = "19", fieldValue= "41" }, - new EnvironmentalSensorHistor{ fieldName = "20", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "21", fieldValue= "31" }, - new EnvironmentalSensorHistor{ fieldName = "22", fieldValue= "23" }, - new EnvironmentalSensorHistor{ fieldName = "23", fieldValue= "11" }, - new EnvironmentalSensorHistor{ fieldName = "24", fieldValue= "21" }, - }); - infoView2_EchartsView.ShowWithOption(echartOption2.InitOption()); + //echartOption2.InitXdataText(new List<string>() + //{ + // "21","22","23","24","25","26","26","27","28","29", + // "21","22","23","24","25","26","26","27","28","29", + // "21","22","23","24" + //}); + //echartOption2.InitYdataText(new List<EnvironmentalSensorHistor>() { + // new EnvironmentalSensorHistor{ fieldName = "1", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "2", fieldValue= "22" }, + // new EnvironmentalSensorHistor{ fieldName = "3", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "4", fieldValue= "21" }, + // new EnvironmentalSensorHistor{ fieldName = "5", fieldValue= "41" }, + // new EnvironmentalSensorHistor{ fieldName = "6", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "7", fieldValue= "31" }, + // new EnvironmentalSensorHistor{ fieldName = "8", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "9", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "10", fieldValue= "21" }, + // new EnvironmentalSensorHistor{ fieldName = "11", fieldValue= "24" }, + // new EnvironmentalSensorHistor{ fieldName = "12", fieldValue= "41" }, + // new EnvironmentalSensorHistor{ fieldName = "13", fieldValue= "32" }, + // new EnvironmentalSensorHistor{ fieldName = "14", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "15", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "16", fieldValue= "22" }, + // new EnvironmentalSensorHistor{ fieldName = "17", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "18", fieldValue= "21" }, + // new EnvironmentalSensorHistor{ fieldName = "19", fieldValue= "41" }, + // new EnvironmentalSensorHistor{ fieldName = "20", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "21", fieldValue= "31" }, + // new EnvironmentalSensorHistor{ fieldName = "22", fieldValue= "23" }, + // new EnvironmentalSensorHistor{ fieldName = "23", fieldValue= "11" }, + // new EnvironmentalSensorHistor{ fieldName = "24", fieldValue= "21" }, + //}); + //infoView2_EchartsView.ShowWithOption(echartOption2.InitOption()); infoView2.AddChidren(new Button() { @@ -476,6 +476,8 @@ }); initQueryButton(); + getTempHistory(); + getWaterHistory(); } @@ -493,6 +495,7 @@ var loadPage = new Loading() { LodingBackgroundColor = 0x88888888, + BackgroundColor = 0x00FFFFFF, }; infoView1.AddChidren(loadPage); @@ -502,7 +505,7 @@ { Application.RunOnMainThread(() => { - loadPage.Start(Language.StringByID(StringId.PleaseWait)); + loadPage.Start(); }); switch (tempQueryType) @@ -566,6 +569,7 @@ var loadPage = new Loading() { LodingBackgroundColor = 0x88888888, + BackgroundColor = 0x00FFFFFF, }; infoView2.AddChidren(loadPage); @@ -575,7 +579,7 @@ { Application.RunOnMainThread(() => { - loadPage.Start(Language.StringByID(StringId.PleaseWait)); + loadPage.Start(); }); switch (waterQueryType) { @@ -637,102 +641,68 @@ var tempQueryDate = new DateTime(tempQueryTime_Year,tempQueryTime_Month,tempQueryTime_Day); if (tempQueryType == QueryType.day_hour) { - tempQueryDate = tempQueryDate.AddDays(-1); if(tempQueryDate.Year == 2023 && tempQueryDate.Month == 1 && tempQueryDate.Day == 1) { - infoView1_DateInfo_PreIconButton.Visible = false; - infoView1_DateInfo_PreClickButton.Enable = false; + return; } - if (tempQueryDate.Year == DateTime.Now.Year && tempQueryDate.Month == DateTime.Now.Month && tempQueryDate.Day == DateTime.Now.Day - 1) - { - infoView1_DateInfo_NextIconButton.Visible = true; - infoView1_DateInfo_NextClickButton.Enable = true; - } + tempQueryDate = tempQueryDate.AddDays(-1); + infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy-MM-dd"); } else if(tempQueryType == QueryType.custom_month) { - tempQueryDate = tempQueryDate.AddMonths(-1); if (tempQueryDate.Year == 2023 && tempQueryDate.Month == 1) { - infoView1_DateInfo_PreIconButton.Visible = false; - infoView1_DateInfo_PreClickButton.Enable = false; + return; } - if (tempQueryDate.Year == DateTime.Now.Year && tempQueryDate.Month == DateTime.Now.Month - 1) - { - infoView1_DateInfo_NextIconButton.Visible = true; - infoView1_DateInfo_NextClickButton.Enable = true; - } + tempQueryDate = tempQueryDate.AddMonths(-1); + infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy-MM"); } else if(tempQueryType == QueryType.custom_year) { - tempQueryDate = tempQueryDate.AddYears(-1); if (tempQueryDate.Year == 2023) { - infoView1_DateInfo_PreIconButton.Visible = false; - infoView1_DateInfo_PreClickButton.Enable = false; + return; } - if (tempQueryDate.Year == DateTime.Now.Year - 1) - { - infoView1_DateInfo_NextIconButton.Visible = true; - infoView1_DateInfo_NextClickButton.Enable = true; - } + tempQueryDate = tempQueryDate.AddYears(-1); + infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy"); } tempQueryTime_Year = tempQueryDate.Year; tempQueryTime_Month = tempQueryDate.Month; tempQueryTime_Day = tempQueryDate.Day; - infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy-MM-dd"); getTempHistory(); }; - infoView1_DateInfo_NextIconButton.Visible = false; - infoView1_DateInfo_NextClickButton.Enable = false; infoView1_DateInfo_NextClickButton.MouseUpEventHandler = (sender, e) => { var tempQueryDate = new DateTime(tempQueryTime_Year, tempQueryTime_Month, tempQueryTime_Day); if (tempQueryType == QueryType.day_hour) { - tempQueryDate = tempQueryDate.AddDays(1); - if (tempQueryDate.Year == 2023 && tempQueryDate.Month == 1 && tempQueryDate.Day == 2) - { - infoView1_DateInfo_PreIconButton.Visible = true; - infoView1_DateInfo_PreClickButton.Enable = true; - } if (tempQueryDate.Year == DateTime.Now.Year && tempQueryDate.Month == DateTime.Now.Month && tempQueryDate.Day == DateTime.Now.Day) { - infoView1_DateInfo_NextIconButton.Visible = false; - infoView1_DateInfo_NextClickButton.Enable = false; + return; } + tempQueryDate = tempQueryDate.AddDays(1); + infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy-MM-dd"); } else if (tempQueryType == QueryType.custom_month) { - tempQueryDate = tempQueryDate.AddMonths(1); - if (tempQueryDate.Year == 2023 && tempQueryDate.Month == 2) - { - infoView1_DateInfo_PreIconButton.Visible = true; - infoView1_DateInfo_PreClickButton.Enable = true; - } if (tempQueryDate.Year == DateTime.Now.Year && tempQueryDate.Month == DateTime.Now.Month ) { - infoView1_DateInfo_NextIconButton.Visible = false; - infoView1_DateInfo_NextClickButton.Enable = false; + return; } + tempQueryDate = tempQueryDate.AddMonths(1); + infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy-MM"); } else if (tempQueryType == QueryType.custom_year) { - tempQueryDate = tempQueryDate.AddYears(1); - if (tempQueryDate.Year == 2023) - { - infoView1_DateInfo_PreIconButton.Visible = false; - infoView1_DateInfo_PreClickButton.Enable = false; - } if (tempQueryDate.Year == DateTime.Now.Year) { - infoView1_DateInfo_NextIconButton.Visible = false; - infoView1_DateInfo_NextClickButton.Enable = false; + return; } + tempQueryDate = tempQueryDate.AddYears(1); + infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy"); } tempQueryTime_Year = tempQueryDate.Year; tempQueryTime_Month = tempQueryDate.Month; tempQueryTime_Day = tempQueryDate.Day; - infoView1_DateInfo_DateTextButton.Text = tempQueryDate.ToString("yyyy-MM-dd"); getTempHistory(); }; @@ -781,102 +751,68 @@ var waterQueryDate = new DateTime(waterQueryTime_Year, waterQueryTime_Month, waterQueryTime_Day); if (waterQueryType == QueryType.day_hour) { - waterQueryDate = waterQueryDate.AddDays(-1); if (waterQueryDate.Year == 2023 && waterQueryDate.Month == 1 && waterQueryDate.Day == 1) { - infoView2_DateInfo_PreIconButton.Visible = false; - infoView2_DateInfo_PreClickButton.Enable = false; + return; } - if (waterQueryDate.Year == DateTime.Now.Year && waterQueryDate.Month == DateTime.Now.Month && waterQueryDate.Day == DateTime.Now.Day - 1) - { - infoView2_DateInfo_NextIconButton.Visible = true; - infoView2_DateInfo_NextClickButton.Enable = true; - } + waterQueryDate = waterQueryDate.AddDays(-1); + infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy-MM-dd"); } else if (waterQueryType == QueryType.custom_month) { - waterQueryDate = waterQueryDate.AddMonths(-1); if (waterQueryDate.Year == 2023 && waterQueryDate.Month == 1) { - infoView2_DateInfo_PreIconButton.Visible = false; - infoView2_DateInfo_PreClickButton.Enable = false; + return; } - if (waterQueryDate.Year == DateTime.Now.Year && waterQueryDate.Month == DateTime.Now.Month - 1) - { - infoView2_DateInfo_NextIconButton.Visible = true; - infoView2_DateInfo_NextClickButton.Enable = true; - } + waterQueryDate = waterQueryDate.AddMonths(-1); + infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy-MM"); } else if (waterQueryType == QueryType.custom_year) { - waterQueryDate = waterQueryDate.AddYears(-1); if (waterQueryDate.Year == 2023) { - infoView2_DateInfo_PreIconButton.Visible = false; - infoView2_DateInfo_PreClickButton.Enable = false; + return; } - if (waterQueryDate.Year == DateTime.Now.Year - 1) - { - infoView2_DateInfo_NextIconButton.Visible = true; - infoView2_DateInfo_NextClickButton.Enable = true; - } + waterQueryDate = waterQueryDate.AddYears(-1); + infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy"); } waterQueryTime_Year = waterQueryDate.Year; waterQueryTime_Month = waterQueryDate.Month; waterQueryTime_Day = waterQueryDate.Day; - infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy-MM-dd"); getWaterHistory(); }; - infoView2_DateInfo_NextIconButton.Visible = false; - infoView2_DateInfo_NextClickButton.Enable = false; infoView2_DateInfo_NextClickButton.MouseUpEventHandler = (sender, e) => { var waterQueryDate = new DateTime(waterQueryTime_Year, waterQueryTime_Month, waterQueryTime_Day); if (waterQueryType == QueryType.day_hour) { - waterQueryDate = waterQueryDate.AddDays(1); if (waterQueryDate.Year == 2023 && waterQueryDate.Month == 1 && waterQueryDate.Day == 2) { - infoView2_DateInfo_PreIconButton.Visible = true; - infoView2_DateInfo_PreClickButton.Enable = true; + return; } - if (waterQueryDate.Year == DateTime.Now.Year && waterQueryDate.Month == DateTime.Now.Month && waterQueryDate.Day == DateTime.Now.Day) - { - infoView2_DateInfo_NextIconButton.Visible = false; - infoView2_DateInfo_NextClickButton.Enable = false; - } + waterQueryDate = waterQueryDate.AddDays(1); + infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy-MM-dd"); } else if (waterQueryType == QueryType.custom_month) { - waterQueryDate = waterQueryDate.AddMonths(1); - if (waterQueryDate.Year == 2023 && waterQueryDate.Month == 2) - { - infoView2_DateInfo_PreIconButton.Visible = true; - infoView2_DateInfo_PreClickButton.Enable = true; - } if (waterQueryDate.Year == DateTime.Now.Year && waterQueryDate.Month == DateTime.Now.Month) { - infoView2_DateInfo_NextIconButton.Visible = false; - infoView2_DateInfo_NextClickButton.Enable = false; + return; } + waterQueryDate = waterQueryDate.AddMonths(1); + infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy-MM"); } else if (waterQueryType == QueryType.custom_year) { - waterQueryDate = waterQueryDate.AddYears(1); if (waterQueryDate.Year == 2023) { - infoView2_DateInfo_PreIconButton.Visible = false; - infoView2_DateInfo_PreClickButton.Enable = false; + return; } - if (waterQueryDate.Year == DateTime.Now.Year) - { - infoView2_DateInfo_NextIconButton.Visible = false; - infoView2_DateInfo_NextClickButton.Enable = false; - } + waterQueryDate = waterQueryDate.AddYears(1); + infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy"); } waterQueryTime_Year = waterQueryDate.Year; waterQueryTime_Month = waterQueryDate.Month; waterQueryTime_Day = waterQueryDate.Day; - infoView2_DateInfo_DateTextButton.Text = waterQueryDate.ToString("yyyy-MM-dd"); getWaterHistory(); }; infoView2_Date_Day.MouseDownEventHandler = (sender, e) => { @@ -1107,6 +1043,10 @@ } if (pickerItems_Month != null) { + if (int2 > pickerItems_Month.Count) + { + int2 = 0; + } if (pickerItems_Month[int2] != item2.ToString()) { int.TryParse(pickerItems_Month[int2], out item2); @@ -1362,6 +1302,10 @@ } if (pickerItems_Month != null) { + if (int2 > pickerItems_Month.Count) + { + int2 = 0; + } if (pickerItems_Month[int2] != item2.ToString()) { int.TryParse(pickerItems_Month[int2], out item2); -- Gitblit v1.8.0