Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/UI/UI2/1-HomePage/HomePage.cs

@@ -455,7 +455,8 @@
                };
                btnPm25Values.Width = btnPm25Values.GetTextWidth();
                environmentalView.AddChidren(btnPm25Values);
#endregion
                #endregion


                btnSecurityStatus = new Button()
                {
@@ -604,9 +605,9 @@
                    TextAlignment = TextAlignment.Center,
                };
                changeView.AddChidren(btnChangeScene);
#endregion
                #endregion

#region ContextView
                #region ContextView
                contentView = new PageLayout()
                {
                    //Y = changeView.Bottom,
@@ -619,7 +620,7 @@

                LoadContentView();

#endregion
                #endregion
            }
            catch (Exception ex)
            {
@@ -633,6 +634,7 @@
        /// </summary>
        void LoadContentView()
        {
           
            if (!Common.ApiUtlis.Ins.DownloadDataComplete && !MainPage.NoLoginMode)
            {
                var waitPage = new Loading();