From 145b157ba183ebf877c93ed2dbb01ec737c993d3 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 08 十二月 2020 18:59:33 +0800
Subject: [PATCH] Merge branch 'WJC'

---
 HDL_ON/Common/HDLCommon.cs |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 3bacd32..9eec670 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -245,13 +245,16 @@
         /// <param name="jpushMessageInfo"></param>
         public void AdjustPushMessage(JPushMessageInfo jpushMessageInfo)
         {
+#if DEBUG
+            return;
+#endif
             try
             {
-
-                if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("Offline"))
+                if (jpushMessageInfo.Extras != null && jpushMessageInfo.Extras.Contains("OffLine"))
                 {
                     Shared.Application.RunOnMainThread(() =>
                     {
+                        
                         //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
                         new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
                         //2020-12-04 寰呭鍔犻��鍑虹櫥褰曟搷浣�
@@ -280,8 +283,12 @@
         /// </summary>
         public void Logout()
         {
+            return;
             try
             {
+                //鏈櫥褰曚笉鐢ㄥ鐞�
+                if (!UserInfo.Current.IsLogin) return;
+
                 Shared.Application.RunOnMainThread(() =>
                 {
                     #region 淇濆瓨鏈湴鏁版嵁鑷虫枃浠跺す

--
Gitblit v1.8.0