Merge branch 'WJC' into temp-wxr

wxr

2021-03-23 09bde2ffef953fa5e78a4320aa8bbe03276ed7c5

 HDL-ON_Android/Application.cs

@@ -28,12 +28,11 @@
            application.StartActivity(intent);
            Android.OS.Process.KillProcess(Android.OS.Process.MyPid());
        }

        
        public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
        public override void OnCreate()
        {
            //注册未处理异常事件

            Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "cb89f20750");
            if (Shared.Application.Activity != null)
            {
@@ -47,6 +46,7 @@
            initAll();

        }

        /// <summary>
        /// 所有初始化全部在这个方法实现
        /// </summary>
@@ -60,7 +60,8 @@
            //隐藏虚拟按键
            BaseActivity.IsHideVirualButtons = true;
            //实现安卓返回按键
            BaseActivity.BackKeyAction = () => {
            BaseActivity.BackKeyAction = () =>
            {
                try
                {
                    var result = MainPage.LoadEvent_BackAction();
@@ -97,7 +98,7 @@
                {
                    Language.CurrentLanguage = "English";
                }
        

                //获取极光推送ID
                GetJPushRegistrationID(activity);

@@ -133,7 +134,7 @@
            BaseActivity.OnResumeAction += (activity) =>
            {
                checkSomeInfo();
                

            };
            BaseActivity.OnDestroyAction += (activity) =>
            {
@@ -142,7 +143,7 @@
                //UserInfo.Current.unlockTime = DateTime.Now;
            };

       


            HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");

@@ -157,14 +158,14 @@
                    //关闭定位服务
                    Shared.Application.StopGPSLocationService();
                }
                  catch(Exception ex)
                catch (Exception ex)
                {
                    Utlis.WriteLine("GetCityInfo catch"+ ex.Message);
                    Utlis.WriteLine("GetCityInfo catch" + ex.Message);
                }
                MainPage.Log($"经纬度:::{lon}:{lat}");
            };

           

        }

        /// <summary>
@@ -173,6 +174,7 @@
        /// <param name="activity"></param>
        void GetJPushRegistrationID(BaseActivity activity)
        {
          
            try
            {
                //保存获取的极光服务器上的注册ID到本地文件