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/Guide/GuideAddResidence.cs |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
index 3cacf24..9def5f4 100644
--- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
+++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Guide/GuideAddResidence.cs
@@ -428,6 +428,7 @@
                     btnConfirm.MouseUpEventHandler += (dou, ni) => {
                         string password = etPw.Text.Trim ();
                         if (string.IsNullOrEmpty (password)) {
+                            Utlis.ShowAlertOnMainThread (Language.StringByID (R.MyInternationalizationString.PasswordIsEmpty));
                             return;
                         }
                         System.Threading.Tasks.Task.Run (() => {
@@ -436,7 +437,7 @@
                                     MainPage.Loading.Start ("Please wait...");
                                 });
                                
-                                var revertObj = HttpServerRequest.Current.LoginByPassword (MainPage.LoginUser.AccountString, MainPage.LoginUser.Password);
+                                var revertObj = HttpServerRequest.Current.LoginByPassword (MainPage.LoginUser.AccountString, password);
                                 if (revertObj.Code == StateCode.SUCCESS) {
                                     //鍒犻櫎浣忓畢
                                     var revertObj2 = HttpServerRequest.Current.DeleteHome (home.Id);
@@ -498,7 +499,7 @@
             MainPage.AddTip ("Enable local mode.");
             Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline);
             CommonPage.IsRemote = false;
-            SmartHome.MqttCommon.DisConnectRemoteMqttClient ("EnableLocalMode");
+            SmartHome.MqttCommon.DisConnectRemote ("EnableLocalMode", false);
         }
 
         /// <summary>

--
Gitblit v1.8.0