From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"

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

diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index ff8a03b..87a58e9 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -57,14 +57,18 @@
             if (jpushExpandData != null && jpushExpandData.messageType != null)
             {
                 pushMes.messageType = jpushExpandData.messageType;
+                pushMes.expantContent = jpushExpandData.expantContent;
+                pushMes.HomeId = jpushExpandData.homeId;
                 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>
@@ -98,7 +102,6 @@
         public override void OnRegister(Context context, string p1)
         {
             base.OnRegister(context, p1);
-
             Utlis.WriteLine("JPushOnRegister: " + p1);
         }
 
@@ -112,8 +115,6 @@
         //{
         //    try
         //    {
-               
-
         //        if (JPushMessageInfo.Extras.Contains("Offline") == true)
         //        {
         //            Shared.Application.RunOnMainThread(() =>
@@ -141,7 +142,7 @@
         //}
 
         /// <summary>
-        /// 鎵撳紑娑堟伅鏄剧ず鐣岄潰
+        /// 鎵撳紑娑堟伅鏄剧ず鐣岄潰.010000
         /// </summary>
         /// <param name="context"></param>
         /// <param name="notificationMessage"></param>
@@ -160,6 +161,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