From 01c46e7bfe9aa8fb20b29f70c83c03a307af548a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 22 十二月 2020 16:35:16 +0800
Subject: [PATCH] 2020-12-22 1.更新。

---
 HDL-ON_Android/Other/JPush/JPushReceiver.cs |   51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index f24b091..86c19ae 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
             };
-            System.Console.WriteLine("PushMes title : " + pushMes.Title);
-            System.Console.WriteLine("PushMes message : " + pushMes.Content);
-            System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
+
+            var jpushExpandData = GetJPushExpandData(pushMes);
+            if (jpushExpandData != null && jpushExpandData.messageType != null)
+            {
+                pushMes.messageType = jpushExpandData.messageType;
+                Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
+            }
+
+            Utlis.WriteLine("PushMes title : " + pushMes.Title);
+            Utlis.WriteLine("PushMes message : " + pushMes.Content);
+            Utlis.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,9 +153,17 @@
                     Content = notificationMessage.NotificationContent,
                     Extras = notificationMessage.NotificationExtras
                 };
-                System.Console.WriteLine("PushMes title : " + pushMes.Title);
-                System.Console.WriteLine("PushMes message : " + pushMes.Content);
-                System.Console.WriteLine("PushMes extras : " + pushMes.Extras);
+
+                var jpushExpandData = GetJPushExpandData(pushMes);
+                if (jpushExpandData != null && jpushExpandData.messageType != null)
+                {
+                    pushMes.messageType = jpushExpandData.messageType;
+                    Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
+                }
+
+                Utlis.WriteLine("PushMes title : " + pushMes.Title);
+                Utlis.WriteLine("PushMes message : " + pushMes.Content);
+                Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
 
                 if (Shared.Application.Activity == null)
                 {

--
Gitblit v1.8.0