Merge remote-tracking branch 'origin/CJL' into NewFilePath

wei

2020-12-12 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11

 HDL-ON_Android/Application.cs

@@ -138,11 +138,11 @@
                //保存获取的极光服务器上的注册ID到本地文件
                var tokenID = JPushInterface.GetRegistrationID(activity);
                Console.WriteLine("RegistrationID:  " + tokenID);
                if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                {
                    UserInfo.Current.PushDeviceToken = tokenID;
                    UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
                    UserInfo.Current.SaveUserInfo();
                    OnAppConfig.Instance.PushDeviceToken = tokenID;
                    OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
                    OnAppConfig.Instance.SaveConfig();
                }
                int loadTokenCount = 0;
                System.Threading.Tasks.Task.Run(() =>
@@ -159,11 +159,11 @@
                        }
                    }
                    Console.WriteLine("RegistrationID:  " + tokenID);
                    if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                    if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                    {
                        UserInfo.Current.PushDeviceToken = tokenID;
                        UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
                        UserInfo.Current.SaveUserInfo();
                        OnAppConfig.Instance.PushDeviceToken = tokenID;
                        OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
                        OnAppConfig.Instance.SaveConfig();
                    }
                });