Merge branch 'CJL-NEW'

wxr

2020-12-09 d60b92c58ac09197642eb6dac9b905f0898dacb8

 HDL-ON_Android/Application.cs

@@ -61,12 +61,7 @@
                {
                    Language.CurrentLanguage = "Chinese";
                }
                //#if DEBUG

                //#else
                //                //注册极光推送
                //                InitJPush(activity);
                //#endif
        
                //获取极光推送ID
                GetJPushRegistrationID(activity);

@@ -111,14 +106,23 @@

            //Shared.Application.IsGpsEnable = true;

            Shared.Application.LocationAction = (arg1, arg2) =>
            //获取经纬度 
            Shared.Application.LocationAction = (lon, lat) =>
            {
                Shared.Application.LocationAction = null;
                try
                {
                    Shared.Application.LocationAction = null;
                    Shared.Application.StopGPSLocationService();
                    new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(lon.ToString(), lat.ToString());
                }
                catch
                {

                new HDL_ON.DAL.Server.HttpServerRequest().GetCityInfo(arg1.ToString(), arg2.ToString());

                MainPage.Log($"经纬度:::{arg1}:{arg2}");
                }
                MainPage.Log($"经纬度:::{lon}:{lat}");
            };

           
        }

        /// <summary>