From be95e839f40eb3ddf64706b60cba6dfcf4fad5e5 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 03 四月 2020 14:31:44 +0800 Subject: [PATCH] 2020-04-03 1.去掉登录前ping百度域名的网络监测。 --- Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs index 19c0095..7384b09 100644 --- a/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs +++ b/Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountView.cs @@ -60,7 +60,7 @@ Button btnUserIcon = new Button () { X = Application.GetRealWidth (27), Width = Application.GetRealWidth (96), - Height = Application.GetRealHeight (96), + Height = Application.GetRealWidth (96), Gravity = Gravity.CenterVertical, Radius = 5, BorderColor = SkinStyle.Current.Transparent, @@ -258,7 +258,7 @@ alertDialog.Close (); IO.FileUtils.DeleteAllFile (); foreach (var tempHome in UserConfig.Instance.HomeLists) { - IO.FileUtils.DeleteRegionFiles (IO.FileUtils.CreateRegionBackup (tempHome.Name)); + IO.FileUtils.DeleteRegionFiles (IO.FileUtils.CreateRegionBackup (tempHome.Id)); } MainPage.LoginUser.LastTime = DateTime.MinValue; MainPage.LoginUser.SaveUserInfo (); @@ -270,7 +270,13 @@ var webPush = new WebServicePush (); webPush.DeleteToken_Push (UserConfig.Instance.tokenID); }); - CommonPage.IsRemote = false; + //2020-02-17 閫�鍑虹櫥褰曪紝鏂紑杩滅▼杩炴帴 + if (CommonPage.IsRemote) { + Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline); + CommonPage.IsRemote = false; + SmartHome.MqttCommon.DisConnectRemoteMqttClient ("Logout"); + } + //CommonPage.IsRemote = false; }; btnNo.MouseUpEventHandler += (sdd, ff) => { @@ -284,7 +290,13 @@ var webPush = new WebServicePush (); webPush.DeleteToken_Push (UserConfig.Instance.tokenID); }); - CommonPage.IsRemote = false; + //CommonPage.IsRemote = false; + //2020-02-17 閫�鍑虹櫥褰曪紝鏂紑杩滅▼杩炴帴 + if (CommonPage.IsRemote) { + Utlis.ShowAppLinkStatus (AppLinkStatus.WiFiOffline); + CommonPage.IsRemote = false; + SmartHome.MqttCommon.DisConnectRemoteMqttClient ("Logout"); + } }; alertDialog.Show (); @@ -295,7 +307,7 @@ // if (e2) { // IO.FileUtils.DeleteAllFile (); // foreach (var tempHome in UserConfig.Instance.HomeLists) { - // IO.FileUtils.DeleteRegionFiles (IO.FileUtils.CreateRegionBackup (tempHome.RegionName)); + // IO.FileUtils.DeleteRegionFiles (IO.FileUtils.CreateRegionBackup (tempHome.Id)); // } // } // MainPage.LoginUser.LastTime = DateTime.MinValue; -- Gitblit v1.8.0