From e990a9737e423d7005506a569e98fb4032fceb46 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:15:08 +0800
Subject: [PATCH] Merge branch 'temp-wxr' into WJC

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

diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 48ee1fc..ccc38c0 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -57,14 +57,17 @@
             if (jpushExpandData != null && jpushExpandData.messageType != null)
             {
                 pushMes.messageType = jpushExpandData.messageType;
+                pushMes.expantContent = jpushExpandData.expantContent;
                 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);
+            Shared.Application.RunOnMainThread(() =>
+            {
+                HDLCommon.Current.AdjustPushMessage(pushMes);
+            });
         }
 
         /// <summary>
@@ -157,6 +160,7 @@
                 if (jpushExpandData != null && jpushExpandData.messageType != null)
                 {
                     pushMes.messageType = jpushExpandData.messageType;
+                    pushMes.expantContent = jpushExpandData.expantContent;
                     Utlis.WriteLine("PushMes messageType : " + pushMes.messageType);
                 }
 

--
Gitblit v1.8.0