Merge branch 'Dev-Branch' into wjc

mac

2023-11-07 efd01cddef2e9d29907592cbed154fba548d7ede

 HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs

@@ -228,13 +228,15 @@
        public void LoadView()
        {
            bodyView.BackgroundColor = CSS_Color.BackgroundColor;
            new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView();
            var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter));
            topView.maginY = 10;
            topView.LoadTopView();

            bodyScrolView = new VerticalScrolViewLayout()
            {
                Y = Application.GetRealHeight(64),
                Y = Application.GetRealHeight(64+10),
                VerticalScrollBarEnabled = false,
                Height = Application.GetRealHeight(551),
                Height = Application.GetRealHeight(551-10),
            };
            bodyView.AddChidren(bodyScrolView);

@@ -856,6 +858,13 @@

#endregion

            bodyView.AddChidren(new Button()
            {
                Y = Application.GetRealHeight(622),
                Height = 1,
                BackgroundColor = CSS_Color.DividingLineColor,
            });

            btnLogout = new Button()
            {
                Y = Application.GetRealHeight(623),