From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL-ON_Android/Other/JPush/JPushReceiver.cs | 83 +++++++++++++++++++++++++++--------------
1 files changed, 54 insertions(+), 29 deletions(-)
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 07f2fcb..745527d 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -1,31 +1,50 @@
锘�
using System;
-using Android.App;
using Android.Content;
using CN.Jpush.Android.Api;
using CN.Jpush.Android.Service;
+using Com.Hdl.Hdllinphonesdk;
using HDL_ON;
using HDL_ON.DAL.Server;
using Shared;
-using Android.OS;
namespace HDL_ON_Android
{
- [BroadcastReceiver(Enabled = true, Exported = false)]
- [Android.App.IntentFilter(new string[]
- {
- "cn.jpush.android.intent.RECEIVE_MESSAGE"
- },
- Categories = new string[]
- {
- "com.hdl.onpro"
- })]
- public class JPushReceiver : JPushMessageReceiver
+ //[BroadcastReceiver(Enabled = true, Exported = false)]
+ //[Android.App.IntentFilter(new string[]
+ //{
+ // "cn.jpush.android.intent.RECEIVE_MESSAGE"
+ //},
+ //Categories = new string[]
+ //{
+ // "com.hdl.onpro"
+ //})]
+
+
+ //[Android.App.Service(Enabled = true)]
+ //[Android.App.IntentFilter(
+ // new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" },
+ // Categories = new string[]
+ // {
+ // "com.hdl.onpro"
+ // })]
+
+ [BroadcastReceiver(Enabled = true, Exported = true)]
+ [Android.App.IntentFilter(new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" }, Categories = new string[] { "com.hdl.onpro" })]
+ public class JPushReceiver : JPushMessageReceiver// JPushMessageService
{
private static string TAG = "JPushReceiver";
+
+ public override void OnMessage(Context p0, CustomMessage p1)
+ {
+ Console.WriteLine("鏀跺埌鏋佸厜鎺ㄩ��");
+ base.OnMessage(p0, p1);
+
+ }
+
/// <summary>
/// 鐢ㄦ埛鐐瑰嚮鎵撳紑浜嗛�氱煡
/// 鐐瑰嚮閫氱煡鍥炶皟
@@ -34,10 +53,8 @@
/// <param name="notificationMessage"></param>
public override void OnNotifyMessageOpened(Context context, NotificationMessage notificationMessage)
{
- //2020-12-23 瑙ｅ喅鐐瑰嚮閫氱煡鏍忔墦寮�涓嶄簡APP闂
- //base.OnNotifyMessageOpened(context, notificationMessage);
-
- OpenNotification(context, notificationMessage);
+ MainPage.Log("鎺ユ敹鍒版帹閫�:鐐瑰嚮閫氱煡鍥炶皟");
+ OpenNotification(context, notificationMessage,true);
}
/// <summary>
@@ -62,14 +79,10 @@
pushMes.messageType = jpushExpandData.messageType;
pushMes.expantContent = jpushExpandData.expantContent;
pushMes.HomeId = jpushExpandData.homeId;
- Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
+ Utlis.WriteLine("鏀跺埌閫氱煡鍥炶皟\r\nPushMes messageType : " + pushMes.messageType);
}
- if (!string.IsNullOrEmpty(pushMes.spk))//鑷爺鍙瀵硅闇�瑕佽褰曟椂闂村弽鍛�
- {
- UserInfo.Current.pushMessageInfo = pushMes;
- UserInfo.Current.inCall = DateTime.Now;
- }
+
Utlis.WriteLine("PushMes title : " + pushMes.Title);
Utlis.WriteLine("PushMes message : " + pushMes.Content);
@@ -114,7 +127,6 @@
public override void OnRegister(Context context, string p1)
{
base.OnRegister(context, p1);
- Utlis.WriteLine("JPushOnRegister: " + p1);
}
/// <summary>
@@ -122,15 +134,17 @@
/// </summary>
/// <param name="context"></param>
/// <param name="notificationMessage"></param>
- public static void OpenNotification(Context context, NotificationMessage notificationMessage)
+ public static void OpenNotification(Context context, NotificationMessage notificationMessage,bool isNotification = false)
{
try
{
+ MainPage.Log("鎺ユ敹鍒版帹閫�:鎵撳紑娑堟伅鏄剧ず鐣岄潰");
var pushMes = new JPushMessageInfo()
{
Title = notificationMessage.NotificationTitle,
Content = notificationMessage.NotificationContent,
- Extras = notificationMessage.NotificationExtras
+ Extras = notificationMessage.NotificationExtras,
+ isNotificationGoing = isNotification
};
var jpushExpandData = GetJPushExpandData(pushMes);
@@ -147,11 +161,23 @@
Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);
- Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
- i.SetFlags(ActivityFlags.NewTask);
- context.StartActivity(i);
+ if (Shared.Application.Activity == null)
+ {
+ Intent i = new Intent(context, typeof(SplashActivity));
+ i.SetFlags(ActivityFlags.NewTask);
+ context.StartActivity(i);
+ }
+ else
+ {
+ Intent i = new Intent(context, typeof(BaseActivity));
+ i.SetFlags(ActivityFlags.SingleTop);
+ i.SetFlags(ActivityFlags.ClearTop);
+ i.SetFlags(ActivityFlags.NewTask);
+ context.StartActivity(i);
+ }
//瑙ｆ瀽msg
AdjustPushMessage(pushMes);
+
}
catch
{
@@ -161,7 +187,6 @@
public static void AdjustPushMessage(JPushMessageInfo pushMes)
{
-
new System.Threading.Thread(new System.Threading.ThreadStart(() =>
{
while (MainPage.BasePageView == null)
--
Gitblit v1.8.0