From 965290476c027deb96891cde1095d9a100581a6b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 20 二月 2020 09:13:32 +0800
Subject: [PATCH] 2020-02-20 1.优化更新。

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
index 3fefd82..11722ba 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
@@ -219,12 +219,19 @@
                     UserConfig.Instance.CurrentRegion = UserConfig.Instance.HomeLists [0];
                 }
             }
+            try {
+                if (IsNeedGoToGuideAddGatewayView) {
+                    IsNeedGoToGuideAddGatewayView = false;
+                    if (UserConfig.Instance.CurrentRegion.IsOthreShare) {
+                        //鎻愮ず娌℃湁鍒嗕韩浣忓畢鐨勬潈闄�
+                        new Alert ("", ErrorCode.InsufficientAuthority, "Close").Show ();
+                        return;
+                    }
 
-            if (IsNeedGoToGuideAddGatewayView) {
-                IsNeedGoToGuideAddGatewayView = false;
-                GotoGuideAddGatewayView (UserConfig.Instance.CurrentRegion);
+                    GotoGuideAddGatewayView (UserConfig.Instance.CurrentRegion);
 
-            }
+                }
+            } catch { }
 
         }
 
@@ -249,6 +256,7 @@
         void AccountLogout ()
         {
             try {
+                this.RemoveFromParent ();
                 MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
                 MainPage.LoginUser.SaveUserInfo ();
                 new AccountLogin ().Show ();
@@ -605,7 +613,7 @@
                                       Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                             //this.RemoveFromParent ();
                             CommonPage.IsRemote = false;
-                            EquipmentPublicClass.CheckLinkRemote (2);
+                            EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
                         }
                         if (bNeedCheckAddRoom) {
                             CheckIfNeedAddRoom ();

--
Gitblit v1.8.0