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

wxr

2022-02-23 b88f0d4dd35615302186c0c238d1b61825a74892

 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()
                {