Merge branch 'Dev-Branch' into wxr-2.1

wxr

2023-07-31 0816a06ec79ad93d3a95a8102b4cdc88e46ded3a

 HDL_ON/UI/UI2/FuntionControlView/Electrical/AirSwitchP3SubloopEnergyPage.cs

@@ -496,9 +496,10 @@
                TextSize = 49,
                TextColor = 0xFF030D1C,
                TextAlignment = TextAlignment.Center,
                Text = device.GetAttrState(FunctionAttributeKey.TotalElectricity),
                Text = device.GetAttrState(key),
            };
            totalElectricityView.AddChidren(btnTotalNumber);
            

            btnShowHistroyData_Day.MouseUpEventHandler += (sender, e) => {
                totalElectricityView.RemoveFromParent();
@@ -506,6 +507,7 @@
                //viewa.Visible = true;
                //viewb.Visible = true;
                //viewc.Visible = true;
                btnTip.TextID = StringId.AirSwitchP3HistroyTip1;
                historyDataView.Height = Application.GetRealHeight(330);
            };
            btnShowHistroyData_Month.MouseUpEventHandler += (sender, e) => {
@@ -514,6 +516,7 @@
                //viewa.Visible = true;
                //viewb.Visible = true;
                //viewc.Visible = true;
                btnTip.TextID = StringId.AirSwitchP3HistroyTip2;
                historyDataView.Height = Application.GetRealHeight(330);
            };
            btnShowHistroyData_Year.MouseUpEventHandler += (sender, e) => {
@@ -522,6 +525,7 @@
                //viewa.Visible = true;
                //viewb.Visible = true;
                //viewc.Visible = true;
                btnTip.TextID = StringId.AirSwitchP3HistroyTip3;
                historyDataView.Height = Application.GetRealHeight(330);
            };
            btnShowHistroyData_Total.MouseUpEventHandler += (sender, e) => {