From 900493415fd36457d7caf6cdf7112fe58c8a0229 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 07 五月 2022 13:10:56 +0800
Subject: [PATCH] 推送问题

---
 HDL-ON_Android/SplashActivity.cs            |   14 ++--
 HDL-ON_Android/Other/JPush/JPushReceiver.cs |  134 +++++++++++++++++++++++++-------------------
 2 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 1d60659..4fdec05 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -43,6 +43,8 @@
             OpenNotification(context, notificationMessage);
         }
 
+       static int msgId = 0;
+
         /// <summary>
         /// 鏀跺埌閫氱煡鍥炶皟
         /// </summary>
@@ -50,47 +52,58 @@
         /// <param name="p1"></param>
         public override void OnNotifyMessageArrived(Context context, NotificationMessage notificationMessage)
         {
-            base.OnNotifyMessageArrived(context, notificationMessage);
+            try
+            {
 
-            var pushMes = new JPushMessageInfo()
-            {
-                Title = notificationMessage.NotificationTitle,
-                Content = notificationMessage.NotificationContent,
-                Extras = notificationMessage.NotificationExtras
-            };
-
-            var jpushExpandData = GetJPushExpandData(pushMes);
-            if (jpushExpandData != null && jpushExpandData.messageType != null)
-            {
-                pushMes.messageType = jpushExpandData.messageType;
-                pushMes.expantContent = jpushExpandData.expantContent;//spk
-                pushMes.HomeId = jpushExpandData.homeId;
-                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
-            }
-
-            Utlis.WriteLine("PushMes title : " + pushMes.Title);
-            Utlis.WriteLine("PushMes message : " + pushMes.Content);
-            Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
-            Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);
-
-            //UserInfo.Current.PushMesTitle = pushMes.Title;
-            //UserInfo.Current.PushMesMessage = pushMes.Content;
-            //UserInfo.Current.PushMesExtras = pushMes.Extras;
-            //UserInfo.Current.pushMesMessageType = pushMes.messageType;
-            //UserInfo.Current.pushMesExpantContent = pushMes.expantContent;
-            //UserInfo.Current.PushMesHomeId = pushMes.HomeId;
-            UserInfo.Current.pushMessageInfo = pushMes;
-            if (!string.IsNullOrEmpty(pushMes.spk))//鑷爺鍙瀵硅闇�瑕佽褰曟椂闂村弽鍛�
-                UserInfo.Current.inCall = DateTime.Now;
-
-            Shared.Application.RunOnMainThread(() =>
-            {
-                HDLCommon.Current.AdjustPushMessage(pushMes);
-            });
-            if (!MainPage.IsEnterBackground)
-            {
                 NotificationManager nMgr = (NotificationManager)Shared.Application.Activity.GetSystemService(Context.NotificationService);
-                nMgr.CancelAll();
+                if (msgId != 0)
+                    nMgr.Cancel(msgId);
+                msgId = notificationMessage.NotificationId;
+                base.OnNotifyMessageArrived(context, notificationMessage); Console.WriteLine("123456789ghjsdjfasdfk");
+
+                var pushMes = new JPushMessageInfo()
+                {
+                    Title = notificationMessage.NotificationTitle,
+                    Content = notificationMessage.NotificationContent,
+                    Extras = notificationMessage.NotificationExtras
+                };
+
+                var jpushExpandData = GetJPushExpandData(pushMes);
+                if (jpushExpandData != null && jpushExpandData.messageType != null)
+                {
+                    pushMes.messageType = jpushExpandData.messageType;
+                    pushMes.expantContent = jpushExpandData.expantContent;//spk
+                    pushMes.HomeId = jpushExpandData.homeId;
+                    Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
+                }
+
+                Utlis.WriteLine("PushMes title : " + pushMes.Title);
+                Utlis.WriteLine("PushMes message : " + pushMes.Content);
+                Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
+                Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);
+
+                //UserInfo.Current.PushMesTitle = pushMes.Title;
+                //UserInfo.Current.PushMesMessage = pushMes.Content;
+                //UserInfo.Current.PushMesExtras = pushMes.Extras;
+                //UserInfo.Current.pushMesMessageType = pushMes.messageType;
+                //UserInfo.Current.pushMesExpantContent = pushMes.expantContent;
+                //UserInfo.Current.PushMesHomeId = pushMes.HomeId;
+                UserInfo.Current.pushMessageInfo = pushMes;
+                if (!string.IsNullOrEmpty(pushMes.spk))//鑷爺鍙瀵硅闇�瑕佽褰曟椂闂村弽鍛�
+                    UserInfo.Current.inCall = DateTime.Now;
+
+                if (!MainPage.IsEnterBackground)
+                {
+                    //NotificationManager nMgr = (NotificationManager)Shared.Application.Activity.GetSystemService(Context.NotificationService);
+                    //nMgr.CancelAll();
+                    Shared.Application.RunOnMainThread(() =>
+                    {
+                        HDLCommon.Current.AdjustPushMessage(pushMes);
+                    });
+                }
+            }
+            catch (Exception wexx) {
+                Console.WriteLine("safsdf"+wexx.Message);
             }
         }
 
@@ -200,25 +213,30 @@
                 i.SetFlags(ActivityFlags.NewTask);
                 context.StartActivity(i);
                 //瑙f瀽msg
-                AdjustPushMessage(pushMes);
-
-                //Shared.Application.RunOnMainThread(() =>
-                //{
-                //    if (Shared.Application.Activity == null)
-                //    {
-                //        var tempIntent = new Intent(context, typeof(Shared.BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
-                //        tempIntent.SetFlags(ActivityFlags.BroughtToFront);
-                //        context.StartActivity(tempIntent);
-
-                //        HDLCommon.Current.AdjustPushMessage(pushMes);
-                //    }
-                //    else
-                //    {
-
-                //        (Shared.Application.Activity as BaseActivity).MoveToFront();
-                //        HDLCommon.Current.AdjustPushMessage(pushMes);
-                //    }
-                //});
+                AdjustPushMessage(pushMes);
+
+                //Shared.Application.RunOnMainThread(() =>
+                //{
+                //    if (Shared.Application.Activity == null)
+                //    {
+                //        var tempIntent = new Intent(context, typeof(Shared.BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
+                //        tempIntent.SetFlags(ActivityFlags.BroughtToFront);
+                //        context.StartActivity(tempIntent);
+
+                //        HDLCommon.Current.AdjustPushMessage(pushMes);
+                //    }
+                //    else
+                //    {
+
+                //        (Shared.Application.Activity as BaseActivity).MoveToFront();
+                //        HDLCommon.Current.AdjustPushMessage(pushMes);
+                //    }
+                //});
+                if (!MainPage.IsEnterBackground)
+                {
+                    NotificationManager nMgr = (NotificationManager)Shared.Application.Activity.GetSystemService(Context.NotificationService);
+                    nMgr.CancelAll();
+                }
             }
             catch
             {
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index e5c0d5a..ac78c22 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -84,7 +84,7 @@
             JPushInterface.Init(this);
 
 
-            BaseActivity.OnCreateActoin += (activity, application) =>
+            BaseActivity.OnCreateActoin = (activity, application) =>
             {
                 //鑾峰彇鏋佸厜鎺ㄩ�両D
                 GetJPushRegistrationID(activity);
@@ -133,7 +133,7 @@
                 }
             };
 
-            BaseActivity.OnCreateActoin += (activity, application) =>
+            BaseActivity.OnCreateActoin = (activity, application) =>
             {
                 Language.CurrentLanguage = "Chinese";
                 Locale locale1 = Locale.Default;
@@ -173,16 +173,16 @@
                     HDLCommon.Current.UpdateInternetStatus((int)internetStatus, MainPage.IsEnterBackground);
                 };
             };
-            BaseActivity.RefreshUIAction += (activity) =>
+            BaseActivity.RefreshUIAction = (activity) =>
             {
                 MainPage.Show();
                 checkSomeInfo();
             };
-            BaseActivity.OnResumeAction += (activity) =>
+            BaseActivity.OnResumeAction = (activity) =>
             {
                 checkSomeInfo();
             };
-            BaseActivity.OnDestroyAction += (activity) =>
+            BaseActivity.OnDestroyAction = (activity) =>
             {
                 Console.WriteLine("OnDestroyAction");
                 //BusSocket.Stop();
@@ -229,7 +229,7 @@
             {
                 //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
                 var tokenID = JPushInterface.GetRegistrationID(activity);
-                Console.WriteLine("RegistrationID:  " + tokenID);
+                Console.WriteLine("RegistrationID1:  " + tokenID);
                 if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                 {
                     OnAppConfig.Instance.PushDeviceToken = tokenID;
@@ -250,7 +250,7 @@
                             break;
                         }
                     }
-                    Console.WriteLine("RegistrationID:  " + tokenID);
+                    Console.WriteLine("RegistrationID2:  " + tokenID);
                     if (!string.IsNullOrEmpty(tokenID) && OnAppConfig.Instance.PushDeviceToken != tokenID)
                     {
                         OnAppConfig.Instance.PushDeviceToken = tokenID;

--
Gitblit v1.8.0