From d4811b7d34b45ff6b21b97f11da128b5572ec526 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 03 三月 2021 16:03:03 +0800
Subject: [PATCH] 20210303-1

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

diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 4b70eb3..6e8b865 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -258,11 +258,11 @@
                 {
                     Shared.Application.RunOnMainThread(() =>
                     {
-                        //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
-                        new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
+                        ////璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
+                        //new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
                         //閫�鍑虹櫥褰曟搷浣�
                         CheckLogout();
-                     
+
                     });
                     return;
                 }
@@ -290,16 +290,35 @@
         }
 
         /// <summary>
+        /// 璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
+        /// 瑕佸湪涓荤嚎绋嬭皟鐢�
         /// 閫�鍑虹櫥褰曟搷浣�
         /// </summary>
         public void CheckLogout()
         {
+            //娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
+            switch (UserInfo.Current.AccountString)
+            {
+                case "13415629083":
+                case "18316120654":
+                case "15622703419":
+                case "18824864143":
+                case "464027401@qq.com":
+                case "2791308028@qq.com":
+                case "13697499568":
+                case "18666455392":
+                case "13375012446":
+                case "13602944661":
+                case "18778381374":
+                case "18316672920":
+                    return;
+            }
+
             //鏈櫥褰曚笉鐢ㄥ鐞�
             if (!UserInfo.Current.IsLogin) return;
 
-#if DEBUG
-            return;
-#endif
+            //璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
+            new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
 
             Logout();
         }
@@ -448,12 +467,13 @@
         {
             MainPage.Log($"缃戠粶鐘舵�佸彉鍖栵紝褰撳墠缃戠粶:{internetStatus} 鏄惁鍚庡彴:{IsEnterBackground.ToString()}");
             //缃戠粶鐘舵�佸彉鍖� 閲嶇疆缃戝叧鐘舵�侀噸鏂版悳绱�
-            Control.Ins.GatewayOnline = false;
+            Control.Ins.GatewayOnline_Cloud = false;
+            Control.Ins.GatewayOnline_Local = false;
+
+            DAL.Mqtt.MqttClient.DisConnectRemote("UpdateInternetStatus", false);
 
             if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
             {
-                //Control.Ins.GatewayOnline = false;
-                Control.Ins.IsRemote = false;
                 MainPage.InternetStatus = 0;
             }
             else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1

--
Gitblit v1.8.0