From df93e50c747a585aa3acad599ba9be7d9617872d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 21 四月 2022 10:28:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into Dev-Branch

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

diff --git a/HDL-ON_Android/Other/JPush/JPushReceiver.cs b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
index 4566b62..1d60659 100644
--- a/HDL-ON_Android/Other/JPush/JPushReceiver.cs
+++ b/HDL-ON_Android/Other/JPush/JPushReceiver.cs
@@ -80,7 +80,8 @@
             //UserInfo.Current.pushMesExpantContent = pushMes.expantContent;
             //UserInfo.Current.PushMesHomeId = pushMes.HomeId;
             UserInfo.Current.pushMessageInfo = pushMes;
-            UserInfo.Current.inCall = DateTime.Now;
+            if (!string.IsNullOrEmpty(pushMes.spk))//鑷爺鍙瀵硅闇�瑕佽褰曟椂闂村弽鍛�
+                UserInfo.Current.inCall = DateTime.Now;
 
             Shared.Application.RunOnMainThread(() =>
             {

--
Gitblit v1.8.0