From 2a88b9b559fd20f42d163d08b582f2d19ff329f4 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 30 九月 2024 17:05:58 +0800
Subject: [PATCH] Update HDLLinphone.cs
---
HDL-ON_Android/Other/JPush/JPushReceiver.cs | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 7c725ec..d6404cf 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -3,6 +3,7 @@
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;
@@ -17,18 +18,21 @@
//},
//Categories = new string[]
//{
- // "com.jinlu.onpro"
+ // "com.hdl.onpro"
//})]
- [Android.App.Service(Enabled = true, Exported = false)]
- [Android.App.IntentFilter(
- new string[] { "cn.jpush.android.intent.SERVICE_MESSAGE" },
- Categories = new string[]
- {
- "com.jinlu.onpro"
- })]
- public class JPushReceiver : JPushMessageService
+ //[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
{
@@ -49,11 +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>
@@ -78,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);
@@ -130,7 +127,6 @@
public override void OnRegister(Context context, string p1)
{
base.OnRegister(context, p1);
- Utlis.WriteLine("鏋佸厜鎺ㄩ��-娉ㄥ唽鎴愬姛鍥炶皟: " + p1);
}
/// <summary>
@@ -138,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);
@@ -172,11 +170,14 @@
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
{
--
Gitblit v1.8.0