From 5727cf0b9b54da0a191dd1e23cb5abf21320fbff Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 25 十一月 2019 10:34:17 +0800
Subject: [PATCH] IOS使用新的项目名称

---
 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
old mode 100755
new mode 100644
index 9d45e5b..f986c8a
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -309,7 +309,7 @@
         /// </summary>
         /// <param name="checkAuthority">鏄惁妫�娴嬫潈闄�</param>
         /// <returns></returns>
-        private static HttpConnectMode GetHttpConnectMode(bool checkAuthority)
+        public static HttpConnectMode GetHttpConnectMode(bool checkAuthority)
         {
             if (checkAuthority == false)
             {
@@ -620,11 +620,7 @@
                 //娓呯┖褰撳墠浣忓畢id
                 Shared.Common.Config.Instance.HomeId = string.Empty;
                 HdlGatewayLogic.Current.ClearAllRealGateway();
-                try
-                {
-                    ZigBee.Device.ZbGateway.RemoteMqttClient?.DisconnectAsync();
-                }
-                catch { }
+               
 
                 if (noticeDb == true)
                 {
@@ -960,6 +956,12 @@
                 Shared.IO.FileUtils.WriteFileByBytes(UserCenterResourse.UserInfo.UserIconFile, UserCenterResourse.UserInfo.HeadImage);
             }
             UserCenterResourse.UserInfo.HeadImage = null;
+            //鎵嬪娍瀵嗙爜
+            UserCenterResourse.Option.GestureAuthentication = UserCenterResourse.UserInfo.GesturePwd == null ? string.Empty : UserCenterResourse.UserInfo.GesturePwd;
+            UserCenterResourse.UserInfo.GesturePwd = null;
+            //瀵嗙爜楠岃瘉
+            UserCenterResourse.Option.PswAuthentication = UserCenterResourse.UserInfo.StringPwd == null ? string.Empty : UserCenterResourse.UserInfo.StringPwd;
+            UserCenterResourse.UserInfo.StringPwd = null;
 
             //鍒濆鍖栫鐞嗗憳鎺у埗涓讳汉鐨勮繛鎺ュ湴鍧�(鍥犱负杩欎釜杩炴帴Token鏄笉浼氭敼鍙樼殑,鎵�浠ュ彧闇�瑕佸垵濮嬪寲涓�娆�)
             await InitAdminConnectMainInfo();

--
Gitblit v1.8.0