V2.6.0金茂热水器，金茂光伏测试通过的版本

wxr

2024-09-11 dd922032a3301ae960f4968eaf33ca14768c0ed1

 HDL_ON/UI/UI2/FuntionControlView/Acst/InverterJinmaoHistroyPage.cs

@@ -1047,6 +1047,8 @@
            };
            uIPickerView.OnSelectChangeEvent = (int1, int2, int3) =>
            {
                try
                {
                if (int1 < 0)
                {
                    int1 = 1;
@@ -1153,6 +1155,11 @@
                        int.TryParse(pickerItems_Day[int3], out item3);
                    }
                }
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂热水器日期选择异常：{ex.StackTrace}");
                }
            };
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
@@ -1186,6 +1193,9 @@
                    btnToday.Visible = btnToday.Enable = true;
                    btnToday.MouseUpEventHandler = (sender, e) =>
                    {
                        item3 = queryTime_Day1 = DateTime.Now.Day;
                        item2 = queryTime_Month1 = DateTime.Now.Month;
                        item1 = queryTime_Year1 = DateTime.Now.Year;
                        pickerItems_Year = new List<string>();
                        pickerItems_Year.Add("2023");
                        while (DateTime.Now.Year > 2022 + pickerItems_Year.Count)
@@ -1193,50 +1203,21 @@
                            pickerItems_Year.Add((2023 + pickerItems_Year.Count).ToString());
                        }

                        if (queryType1 == QueryType.custom_month || queryType1 == QueryType.day_hour)
                        {
                            pickerItems_Month = new List<string>();
                            if (queryTime_Year1 == DateTime.Now.Year)
                            {
                                int addMonth = 0;
                                while (DateTime.Now.Month > addMonth)
                                {
                                    addMonth++;
                                    pickerItems_Month.Add(addMonth.ToString());
                                }
                            }
                            else
                            {
                                for (var i = 1; i < 13; i++)
                                {
                                    pickerItems_Month.Add(i.ToString());
                                }
                            }
                            if (queryType1 == QueryType.day_hour)
                            {
                                pickerItems_Day = new List<string>();
                                if (queryTime_Month1 == DateTime.Now.Month)
                                {
                                    int addDay = 0;
                                    while (DateTime.Now.Day > addDay)
                                    {
                                        addDay++;
                                        pickerItems_Day.Add(addDay.ToString());
                                    }
                                }
                                else
                                {
                                    for (var i = 1; i <= DateTime.DaysInMonth(queryTime_Year1, queryTime_Month1); i++)
                                    {
                                        pickerItems_Day.Add(i.ToString());
                                    }
                                }
                            }
                        }

                        item3 = queryTime_Day1 = DateTime.Now.Day;
                        item2 = queryTime_Month1 = DateTime.Now.Month;
                        item1 = queryTime_Year1 = DateTime.Now.Year;
                        uIPickerView.setNPicker(pickerItems_Year, pickerItems_Month, pickerItems_Day);
                        uIPickerView.setCurrentItems(pickerItems_Year.IndexOf(queryTime_Year1.ToString()),
                            pickerItems_Month == null ? 0 : pickerItems_Month.IndexOf(queryTime_Month1.ToString()),
@@ -1383,6 +1364,8 @@
            };
            uIPickerView.OnSelectChangeEvent = (int1, int2, int3) =>
            {
                try
                {
                if (int1 < 0)
                {
                    int1 = 0;
@@ -1483,6 +1466,11 @@
                        int.TryParse(pickerItems_Day[int3], out item3);
                    }
                }
                }
                catch (Exception ex)
                {
                    MainPage.Log("Error", $"金茂光伏日期2选择异常：{ex.StackTrace}");
                }
            };
            btnConfrim.MouseUpEventHandler = (sender, e) =>
            {
@@ -1529,6 +1517,10 @@
                    btnToday.Visible = btnToday.Enable = true;
                    btnToday.MouseUpEventHandler = (sender, e) =>
                    {
                        item3 = queryTime_Day2 = DateTime.Now.Day;
                        item2 = queryTime_Month2 = DateTime.Now.Month;
                        item1 = queryTime_Year2 = DateTime.Now.Year;

                        pickerItems_Year = new List<string>();
                        pickerItems_Year.Add("2023");
                        while (DateTime.Now.Year > 2022 + pickerItems_Year.Count)
@@ -1536,50 +1528,21 @@
                            pickerItems_Year.Add((2023 + pickerItems_Year.Count).ToString());
                        }

                        if (queryType2 == QueryType.custom_month || queryType2 == QueryType.day_hour)
                        {
                            pickerItems_Month = new List<string>();
                            if (queryTime_Year2 == DateTime.Now.Year)
                            {
                                int addMonth = 0;
                                while (DateTime.Now.Month > addMonth)
                                {
                                    addMonth++;
                                    pickerItems_Month.Add(addMonth.ToString());
                                }
                            }
                            else
                            {
                                for (var i = 1; i < 13; i++)
                                {
                                    pickerItems_Month.Add(i.ToString());
                                }
                            }
                            if (queryType2 == QueryType.day_hour)
                            {
                                pickerItems_Day = new List<string>();
                                if (queryTime_Month2 == DateTime.Now.Month)
                                {
                                    int addDay = 0;
                                    while (DateTime.Now.Day > addDay)
                                    {
                                        addDay++;
                                        pickerItems_Day.Add(addDay.ToString());
                                    }
                                }
                                else
                                {
                                    for (var i = 1; i <= DateTime.DaysInMonth(queryTime_Year2, queryTime_Month2); i++)
                                    {
                                        pickerItems_Day.Add(i.ToString());
                                    }
                                }
                            }
                        }

                        item3 = queryTime_Day2 = DateTime.Now.Day;
                        item2 = queryTime_Month2 = DateTime.Now.Month;
                        item1 = queryTime_Year2 = DateTime.Now.Year;
                        uIPickerView.setNPicker(pickerItems_Year, pickerItems_Month, pickerItems_Day);
                        uIPickerView.setCurrentItems(pickerItems_Year.IndexOf(queryTime_Year2.ToString()),
                            pickerItems_Month == null ? 0 : pickerItems_Month.IndexOf(queryTime_Month2.ToString()),