Merge branch 'wxr-2.1' into Dev-Branch

wxr

2023-07-30 88b9c9dbae4f0f28529cd3b3ffe53cd26f19f738

Merge branch 'wxr-2.1' into Dev-Branch

 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

 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();
            }