Merge remote-tracking branch 'origin/CJL-NEW'

wxr

2020-12-01 a2927467ebfa938a420f392deb6882b35570fd33

 HDL-ON_Android/Application.cs

@@ -5,6 +5,7 @@
using Android.Content;
using Android.Net;
using Android.OS;
using CN.Jpush.Android.Api;
using HDL_ON;
using Java.Util;
using Shared;
@@ -60,6 +61,10 @@
                {
                    Language.CurrentLanguage = "Chinese";
                }
#if Release
                //注册极光推送
                InitJPush(activity);
#endif

                BaseActivity.NetworkStateChanged += (int obj) =>
                {
@@ -111,11 +116,66 @@
                MainPage.Log($"经纬度:::{arg1}:{arg2}");
            };
        }

        /// <summary>
        /// 
        /// </summary>
        /// <param name="activity"></param>
        void InitJPush(BaseActivity activity)
        {
            try
            {
                //#if Release
                //保存获取的极光服务器上的注册ID到本地文件
                var tokenID = JPushInterface.GetRegistrationID(activity);
                Console.WriteLine("RegistrationID:  " + tokenID);
                if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                {
                    OnAppConfig.Instance.PushDeviceToken = tokenID;
                    OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
                    OnAppConfig.Instance.SaveUserConfig();
                }
                int loadTokenCount = 0;
                System.Threading.Tasks.Task.Run(() =>
                {
                    while (string.IsNullOrEmpty(tokenID))
                    {
                        System.Threading.Thread.Sleep(1000);
                        tokenID = JPushInterface.GetRegistrationID(activity);
                        Utlis.WriteLine("Sleep.tokenID + " + JPushInterface.GetRegistrationID(activity));
                        loadTokenCount++;
                        if (loadTokenCount > 30)
                        {
                            break;
                        }
                    }
                    Utlis.WriteLine("RegistrationID:  " + tokenID);
                    if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                    {
                        OnAppConfig.Instance.PushDeviceToken = tokenID;
                        OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
                        OnAppConfig.Instance.SaveUserConfig();
                    }
                });

                //#endif
            }
            catch
            {

            }
        }

        public static bool IsShowTip = true;
        void init()
        {
            //手机名称 Android.OS.Build.Manufacturer;
            OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
            //OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
#if Release
            //设置极光调试模式，为false时只打印警告信息
            JPushInterface.SetDebugMode(false);
            JPushInterface.Init(this);//保存手机名称到本地文件
#endif
        }
        void checkSomeInfo()
        {
@@ -256,4 +316,5 @@
            //BusSocket.Start();
        }
    }

}