From 86b4742e122bb3ff19f8b61574b4bbf8e5db4b11 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期六, 12 十二月 2020 19:35:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/CJL' into NewFilePath

---
 HDL-ON_Android/Application.cs |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 2d2491d..0325145 100644
--- a/HDL-ON_Android/Application.cs
+++ b/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();
                     }
                 });
 

--
Gitblit v1.8.0