2020-01-10 2020-01-10 1.修改切换本地和远程问题。 2.修改判断住宅网关方案。 3.其它优化修改。

陈嘉乐

2020-01-10 365eadb33ee86b05ac74d408025d102a758c2efd

 Crabtree/SmartHome/UI/SimpleControl/Phone/User/UserMiddle.cs

@@ -206,11 +206,15 @@
                new AccountLogin ().Show ();
                UserConfig.Instance.TipVersionBackup = UserConfig.Instance.VersionNumber;
            } else {
                if (UserConfig.Instance.GatewayList.Count == 0) {
                //if (UserConfig.Instance.GatewayList.Count == 0) {
               //2020-01-10 Mac没绑定并且为主账号
               if (!UserConfig.Instance.CheckHomeGatewaysNotEmpty() && MainPage.LoginUser.AccountType == 0) {
                    UserHomePage.FrameLayoutMain.AddChidren (guidePageView);
                    var guide = new GuideAddResidence ();
                    guide.IsHideBack = true;
                    guidePageView.AddChidren (guide);
                    guide.ShowHomeList (false);
                    
                    guide.ShowHomeList (true);
                    guidePageView.PageIndex = 0;
                    MainPage.LoginUser.LastTime = DateTime.MinValue;
                    MainPage.LoginUser.SaveUserInfo ();
@@ -227,7 +231,7 @@
                    try {
                        var requestObj = new LoginObj () { Account = MainPage.LoginUser.AccountString, Password = MainPage.LoginUser.Password, Company = MainPage.SoftSmsType };
                        var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject (requestObj);
                        var revertObj = MainPage.RequestHttps (API.Login, requestJson, false, false);
                        var revertObj = MainPage.RequestHttps (API.Login, requestJson);
                        if (revertObj != null) {
                            Application.RunOnMainThread (() => {
                                if (revertObj.StateCode.ToUpper() == "SUCCESS") {