Merge branch 'Dev-Branch'

wxr

2023-06-06 592974441a4df95fffd9167c90192da1a390b1c2

 HDL_ON/UI/UI2/UserPage.cs

@@ -91,7 +91,7 @@
        {
            try
            {
                bodyView = this;
                bodyView = this;//1
                bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
                ContextView = new FrameLayout()
                {
@@ -104,12 +104,10 @@
                {
                    Y = Application.GetRealHeight(607),
                    Height = Application.GetMinRealAverage(60),
                    //BackgroundColor = CSS_Color.BackgroundColor
                };
                bodyView.AddChidren(navigationView);
                if (MainPage.Increase)
                {
                    //ContextView.Height = Application.GetRealHeight(618 + 20);
                    navigationView.Y = Application.GetRealHeight(597 + 5);
                    navigationView.Height = Application.GetRealHeight(70 - 5);
                }
@@ -117,9 +115,9 @@

                LoadEventList();

                var homePage = new HomePage();
                ContextView.AddChidren(homePage);
                homePage.LoadPage();
                //var homePage = new HomePage();
                //ContextView.AddChidren(homePage);
                //homePage.LoadPage();

                if (!MainPage.NoLoginMode)
                {
@@ -132,7 +130,11 @@
                //开启定位服务
                try
                {
                    Shared.Application.StartGPSLocationService();
                    if (DB_ResidenceData.Instance.CheckGPS_IsFirst)
                    {
                        DB_ResidenceData.Instance.CheckGPS_IsFirst = false;
                        Shared.Application.StartGPSLocationService();
                    }
                }catch(Exception ex)
                {
                    MainPage.Log("开启定位服务异常:" + ex.Message);