2021-02-05 1.编译冲突修改

JLChen

2021-02-05 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a

 HDL-ON_Android/Application.cs

@@ -61,7 +61,6 @@
            BaseActivity.IsHideVirualButtons = true;
            //实现安卓返回按键
            BaseActivity.BackKeyAction = () => {
                MainPage.Log($"android后退");
                try
                {
                    var result = MainPage.LoadEvent_BackAction();
@@ -78,9 +77,9 @@
                            break;
                    }
                }
                catch (System.Exception ezx)
                catch (Exception ex)
                {
                    Console.WriteLine(ezx.Message);
                    Console.WriteLine(ex.Message);
                }
            };

@@ -94,6 +93,10 @@
                {
                    Language.CurrentLanguage = "Chinese";
                }
                else
                {
                    Language.CurrentLanguage = "English";
                }
        
                //获取极光推送ID
                GetJPushRegistrationID(activity);