From 8a10caa6573a67dac87be44d6990151248b2cc44 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 04 十二月 2020 13:58:27 +0800
Subject: [PATCH] 2020-12-04 1.优化Android极光推送,未完善。

---
 HDL-ON_Android/Application.cs |   40 +++++++++++++++++++---------------------
 1 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 8b47174..1304502 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -61,12 +61,14 @@
                 {
                     Language.CurrentLanguage = "Chinese";
                 }
-#if DEBUG
+                //#if DEBUG
 
-#else
-                //娉ㄥ唽鏋佸厜鎺ㄩ��
-                InitJPush(activity);
-#endif
+                //#else
+                //                //娉ㄥ唽鏋佸厜鎺ㄩ��
+                //                InitJPush(activity);
+                //#endif
+                //鑾峰彇鏋佸厜鎺ㄩ�両D
+                GetJPushRegistrationID(activity);
 
                 BaseActivity.NetworkStateChanged += (int obj) =>
                 {
@@ -123,19 +125,18 @@
         /// 
         /// </summary>
         /// <param name="activity"></param>
-        void InitJPush(BaseActivity activity)
+        void GetJPushRegistrationID(BaseActivity activity)
         {
             try
             {
-                //#if Release
                 //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
                 var tokenID = JPushInterface.GetRegistrationID(activity);
                 Console.WriteLine("RegistrationID:  " + tokenID);
-                if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
+                if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                 {
-                    OnAppConfig.Instance.PushDeviceToken = tokenID;
-                    OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
-                    OnAppConfig.Instance.SaveUserConfig();
+                    UserInfo.Current.PushDeviceToken = tokenID;
+                    UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
+                    UserInfo.Current.SaveUserInfo();
                 }
                 int loadTokenCount = 0;
                 System.Threading.Tasks.Task.Run(() =>
@@ -152,15 +153,14 @@
                         }
                     }
                     Console.WriteLine("RegistrationID:  " + tokenID);
-                    if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
+                    if (!string.IsNullOrEmpty(tokenID) && UserInfo.Current.PushDeviceToken != tokenID)
                     {
-                        OnAppConfig.Instance.PushDeviceToken = tokenID;
-                        OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
-                        OnAppConfig.Instance.SaveUserConfig();
+                        UserInfo.Current.PushDeviceToken = tokenID;
+                        UserInfo.Current.PhoneName = Android.OS.Build.Manufacturer;
+                        UserInfo.Current.SaveUserInfo();
                     }
                 });
 
-                //#endif
             }
             catch
             {
@@ -174,12 +174,10 @@
             //鎵嬫満鍚嶇О Android.OS.Build.Manufacturer;
             //OnAppConfig.Instance.PhoneName = Android.OS.Build.Manufacturer;
 #if DEBUG
-
-#else
-            //璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
-            JPushInterface.SetDebugMode(false);
-            JPushInterface.Init(this);//淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠�
+            CN.Jpush.Android.Api.JPushInterface.SetDebugMode(true);
 #endif
+            CN.Jpush.Android.Api.JPushInterface.Init(this);
+
         }
         void checkSomeInfo()
         {

--
Gitblit v1.8.0