Merge branch 'Dev-Branch' into Dev-Wxr

wxr

2023-04-11 93a578f5182792b4dd981e874e2746e8b3e34e2e

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

@@ -597,7 +597,7 @@
            var btnTitleText2 = new Button()
            {
                X = btnCollection.Right,
                Text = "我的家庭",
                TextID = StringId.MyHome,
                TextSize = 16,
                TextColor = 0xFF242424,
                TextAlignment = TextAlignment.CenterLeft,
@@ -605,10 +605,6 @@
                Height = Application.GetRealHeight(54),
            };
            subTitleView.AddChidren(btnTitleText2);
            if(Language.CurrentLanguage != "Chinese")
            {
                btnTitleText2.Text = "My Home";
            }

            int subFunctionCount = 0;