Merge remote-tracking branch 'origin/release0123' into wjc

wjc

2022-03-02 a154c3ce81601e3c202d3c5f4d0a8cefc5a7e8ae

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

@@ -180,7 +180,7 @@
                    Text = function.GetAttrState("total_electricity"),
                    TextAlignment = TextAlignment.BottomLeft,
                };
                btnTotalElectricity.Width = btnTotalElectricity.GetTextWidth();
                btnTotalElectricity.Width = btnTotalElectricity.GetTextWidth()+ Application.GetRealWidth(5);
                controlView.AddChidren(btnTotalElectricity);
                var btnTotalElectricityUnit = new Button()
                {