From 0ee75b88cfe03e46289de0de96e8ed4580c797d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 27 九月 2022 14:04:21 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into dev--wxr
---
HDL-ON_Android/Other/JPush/JPushReceiver.cs | 70 +++-------------------------------
1 files changed, 7 insertions(+), 63 deletions(-)
diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 9438176..07f2fcb 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -65,6 +65,12 @@
Utlis.WriteLine("PushMes 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);
Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
@@ -111,42 +117,6 @@
Utlis.WriteLine("JPushOnRegister: " + p1);
}
- ///// <summary>
- ///// 澶勭悊鏋佸厜淇℃伅鎺ㄩ��
- ///// </summary>
- ///// <param name="title">鏍囬</param>
- ///// <param name="message">淇℃伅</param>
- ///// <param name="extras">璐熻浇鏁版嵁</param>
- //public void AdjustJiguangMsgPush(JPushMessageInfo JPushMessageInfo)
- //{
- // try
- // {
- // if (JPushMessageInfo.Extras.Contains("Offline") == true)
- // {
- // Shared.Application.RunOnMainThread(() =>
- // {
- // //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
- // new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- // //2020-12-04 寰呭鍔犻��鍑虹櫥褰曟搷浣�
- // });
- // return;
- // }
- // else
- // {
- // Shared.Application.RunOnMainThread(() =>
- // {
- // new Alert(JPushMessageInfo.Title, JPushMessageInfo.Content, Language.StringByID(StringId.Close)).Show();
- // });
- // return;
-
- // }
- // }
- // catch
- // {
-
- // }
- //}
-
/// <summary>
/// 鎵撳紑娑堟伅鏄剧ず鐣岄潰.010000
/// </summary>
@@ -154,7 +124,6 @@
/// <param name="notificationMessage"></param>
public static void OpenNotification(Context context, NotificationMessage notificationMessage)
{
-
try
{
var pushMes = new JPushMessageInfo()
@@ -178,42 +147,17 @@
Utlis.WriteLine("PushMes extras : " + pushMes.Extras);
Utlis.WriteLine("PushMes HomeId : " + pushMes.HomeId);
-
Intent i = new Intent(context, typeof(BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
i.SetFlags(ActivityFlags.NewTask);
- context.StartActivity(i);
+ context.StartActivity(i);
//瑙ｆ瀽msg
AdjustPushMessage(pushMes);
-
- //Shared.Application.RunOnMainThread(() =>
- //{
- // if (Shared.Application.Activity == null)
- // {
- // var tempIntent = new Intent(context, typeof(Shared.BaseActivity));//Intent intent=new Intent( 璧峰缁勪欢瀵硅薄 , 鐩爣 Service.class);
- // tempIntent.SetFlags(ActivityFlags.BroughtToFront);
- // context.StartActivity(tempIntent);
-
- // HDLCommon.Current.AdjustPushMessage(pushMes);
- // }
- // else
- // {
-
- // (Shared.Application.Activity as BaseActivity).MoveToFront();
- // HDLCommon.Current.AdjustPushMessage(pushMes);
- // }
- //});
}
catch
{
}
- //catch (Exception ex)
- //{
- // Utlis.WriteLine(ex.ToString());
- //}
}
-
-
public static void AdjustPushMessage(JPushMessageInfo pushMes)
{
--
Gitblit v1.8.0