From 271c46f52e74845dac76fa5ece4eb8b94d9168f4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 08 四月 2022 10:12:31 +0800
Subject: [PATCH] 金茂温控器

---
 HDL-ON_Android/Other/JPush/JPushReceiver.cs |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 9438176..4566b62 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -37,6 +37,9 @@
             //2020-12-23 瑙e喅鐐瑰嚮閫氱煡鏍忔墦寮�涓嶄簡APP闂
             //base.OnNotifyMessageOpened(context, notificationMessage);
 
+            //NotificationManager NotifyManager = (NotificationManager)GetSystemService(Context.NotificationService);
+            //NotificationManager notificationManager = NotifyManager;
+
             OpenNotification(context, notificationMessage);
         }
 
@@ -60,7 +63,7 @@
             if (jpushExpandData != null && jpushExpandData.messageType != null)
             {
                 pushMes.messageType = jpushExpandData.messageType;
-                pushMes.expantContent = jpushExpandData.expantContent;
+                pushMes.expantContent = jpushExpandData.expantContent;//spk
                 pushMes.HomeId = jpushExpandData.homeId;
                 Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
             }
@@ -70,11 +73,24 @@
             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;
+            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();
+            }
         }
 
         /// <summary>

--
Gitblit v1.8.0