From 5a5a2b696866f947b6025d26c3302e8ffef46435 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 11 一月 2021 16:11:20 +0800
Subject: [PATCH] 2021-01-11 1.更新MQTT连接和本地搜索网关方法。2.子账号相关接口完善

---
 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
index 258f72c..e9fd37d 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs
@@ -261,28 +261,31 @@
                     try {
                         var revertObj = HttpServerRequest.Current.LoginByPassword (MainPage.LoginUser.AccountString, MainPage.LoginUser.Password);
                         if (revertObj != null) {
-                            Application.RunOnMainThread (() => {
-                                if (revertObj.Code == StateCode.SUCCESS) {
-                                    var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.Data.ToString ());
-                                    //MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
-                                    MainPage.LoginUser.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
-                                    MainPage.LoginUser.RefreshToken = revertData.refreshToken;
-                                    MainPage.LoginUser.LastTime = DateTime.Now;
-                                    MainPage.LoginUser.SaveUserInfo ();
-                                    //2020-01-14 楠岃瘉璐﹀彿閫氳繃鍚�
-                                    if (!bFromLogin) {
-                                        HttpServerRequest.Current.GetHomeGatewayList ();
-                                    }
-                                } else if (!string.IsNullOrEmpty (revertObj.Code)) {
-                                    if (revertObj.Code != StateCode.NETWORK_ERROR && revertObj.Code != StateCode.DATA_EXCEPTION) {
-                                        MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
-                                        MainPage.LoginUser.SaveUserInfo ();
-                                        //鎻愮ず閿欒鍘熷洜
-                                        IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
-                                        new AccountLogin ().Show ();
-                                    }
+                            //Application.RunOnMainThread (() => {
+                            if (revertObj.Code == StateCode.SUCCESS) {
+                                var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes> (revertObj.Data.ToString ());
+                                //MainPage.LoginUser.AllVisionRegisterDevUserNameGuid = revertData.AllVisionRegisterDevUserNameGuid;
+                                MainPage.LoginUser.LoginTokenString = revertData.headerPrefix + revertData.accessToken;
+                                MainPage.LoginUser.RefreshToken = revertData.refreshToken;
+                                MainPage.LoginUser.LastTime = DateTime.Now;
+                                MainPage.LoginUser.SaveUserInfo ();
+                                //2020-01-14 楠岃瘉璐﹀彿閫氳繃鍚�
+                                if (!bFromLogin) {
+                                    HttpServerRequest.Current.GetHomeGatewayList ();
                                 }
-                            });
+                            } else if (!string.IsNullOrEmpty (revertObj.Code)) {
+                                if (revertObj.Code != StateCode.NETWORK_ERROR && revertObj.Code != StateCode.DATA_EXCEPTION) {
+                                    MainPage.LoginUser.LastTime = DateTime.Now.AddDays (-30);
+                                    MainPage.LoginUser.SaveUserInfo ();
+                                    //鎻愮ず閿欒鍘熷洜
+                                    IMessageCommon.Current.ShowErrorInfoAlter (revertObj.Code);
+                                    Application.RunOnMainThread (() => {
+                                        new AccountLogin ().Show ();
+                                    });
+
+                                }
+                            }
+                            //});
                         }
                     } catch { } finally {
                         UserConfig.Instance.SaveUserConfig ();

--
Gitblit v1.8.0