From 797358fee56a79b8c783aebb87b275f2e8ad1334 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 08 三月 2021 09:21:07 +0800
Subject: [PATCH] Merge branch 'CJL' into temp-wxr
---
HDL-ON_Android/Other/JPush/JPushReceiver.cs | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 2665c1d..ff8a03b 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -1,4 +1,5 @@
锘�
+using System;
using Android.Content;
using CN.Jpush.Android.Api;
using CN.Jpush.Android.Service;
@@ -30,7 +31,8 @@
/// <param name="notificationMessage"></param>
public override void OnNotifyMessageOpened(Context context, NotificationMessage notificationMessage)
{
- base.OnNotifyMessageOpened(context, notificationMessage);
+ //2020-12-23 瑙ｅ喅鐐瑰嚮閫氱煡鏍忔墦寮�涓嶄簡APP闂
+ //base.OnNotifyMessageOpened(context, notificationMessage);
OpenNotification(context, notificationMessage);
}
@@ -55,12 +57,12 @@
if (jpushExpandData != null && jpushExpandData.messageType != null)
{
pushMes.messageType = jpushExpandData.messageType;
- System.Console.WriteLine("PushMes messageType : " + pushMes.messageType);
+ Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
}
- System.Console.WriteLine("PushMes title : " + pushMes.Title);
- System.Console.WriteLine("PushMes message : " + pushMes.Content);
- System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
+ Utlis.WriteLine("PushMes title : " + pushMes.Title);
+ Utlis.WriteLine("PushMes message : " + pushMes.Content);
+ Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
HDLCommon.Current.AdjustPushMessage(pushMes);
}
@@ -158,32 +160,47 @@
if (jpushExpandData != null && jpushExpandData.messageType != null)
{
pushMes.messageType = jpushExpandData.messageType;
- System.Console.WriteLine("PushMes messageType : " + pushMes.messageType);
+ Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
}
- System.Console.WriteLine("PushMes title : " + pushMes.Title);
- System.Console.WriteLine("PushMes message : " + pushMes.Content);
- System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
-
- if (Shared.Application.Activity == null)
+ Utlis.WriteLine("PushMes title : " + pushMes.Title);
+ Utlis.WriteLine("PushMes message : " + pushMes.Content);
+ Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
+ Shared.Application.RunOnMainThread(() =>
{
- var tempIntent = new Intent(context, typeof(Shared.BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
- tempIntent.SetFlags(ActivityFlags.BroughtToFront);
- context.StartActivity(tempIntent);
+ Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
+ i.SetFlags(ActivityFlags.NewTask);
+ context.StartActivity(i);
HDLCommon.Current.AdjustPushMessage(pushMes);
- }
- else
- {
- (Shared.Application.Activity as BaseActivity).MoveToFront();
+ });
- HDLCommon.Current.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);
+ // }
+ //});
}
catch
{
}
+ //catch (Exception ex)
+ //{
+ // Utlis.WriteLine(ex.ToString());
+ //}
}
}
--
Gitblit v1.8.0