From 5ea6aa8ea047d4d7b6137fa86c03109aeb1b67ff Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 18 十二月 2020 18:03:18 +0800
Subject: [PATCH] Merge branch 'CJL' into NewFilePath
---
HDL-ON_Android/Other/JPush/JPushReceiver.cs | 39 +++++++++++++++++++++++++++++++++++++++
1 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index f24b091..2665c1d 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -50,12 +50,43 @@
Content = notificationMessage.NotificationContent,
Extras = notificationMessage.NotificationExtras
};
+
+ var jpushExpandData = GetJPushExpandData(pushMes);
+ if (jpushExpandData != null && jpushExpandData.messageType != null)
+ {
+ pushMes.messageType = jpushExpandData.messageType;
+ System.Console.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);
HDLCommon.Current.AdjustPushMessage(pushMes);
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="pushMes"></param>
+ /// <returns></returns>
+ ExpandData GetJPushExpandData(JPushMessageInfo pushMes)
+ {
+ try
+ {
+ if (pushMes.Extras != null)
+ {
+ var jpushExpandData = Newtonsoft.Json.JsonConvert.DeserializeObject<JPushExpandData>(pushMes.Extras.ToString());
+ return Newtonsoft.Json.JsonConvert.DeserializeObject<ExpandData>(jpushExpandData.expandData);
+ }
+ return null;
+ }
+ catch
+ {
+ return null;
+ }
+ }
+
/// <summary>
/// 娉ㄥ唽鎴愬姛鍥炶皟
@@ -122,6 +153,14 @@
Content = notificationMessage.NotificationContent,
Extras = notificationMessage.NotificationExtras
};
+
+ var jpushExpandData = GetJPushExpandData(pushMes);
+ if (jpushExpandData != null && jpushExpandData.messageType != null)
+ {
+ pushMes.messageType = jpushExpandData.messageType;
+ System.Console.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);
--
Gitblit v1.8.0