JLChen
2020-04-03 be95e839f40eb3ddf64706b60cba6dfcf4fad5e5
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -260,7 +260,7 @@
                                MainPage.Loading.Start ("Login...");
                            }
                        });
                        if (UserConfig.Instance.internetStatus == 0 || !SystemRemote.checeInternet ()) {
                        if (UserConfig.Instance.internetStatus == 0) {
                            Application.RunOnMainThread (() => {
                                new Tip () { Text = "Network abnormal, unable to connect to the Internet", Direction = AMPopTipDirection.Down, CloseTime = 3 }.Show (btnLogo);
                            });
@@ -284,7 +284,7 @@
                    } catch (Exception ex) {
                        MainPage.FailureToServer ();
                        Console.WriteLine (ex.Message);
                        Utlis.WriteLine (ex.Message);
                    } finally {
                        Application.RunOnMainThread (() => {
                            MainPage.Loading.Hide ();
@@ -498,7 +498,13 @@
                    } else {
                        //2020-01-11 
                        var findRoom = revertRoomData.Find ((obj) => obj.Id == UserConfig.Instance.CurrentRegion.Id);
                        if (findRoom == null) {
                        if (findRoom != null && UserConfig.Instance.CheckThisHomeGatewaysNotEmpty (findRoom)) {
                            //刷新住宅 解决子账号问题
                            UserConfig.Instance.CurrentRegion = findRoom;
                            Room.InitAllRoom ();
                        } else {
                            //if (findRoom == null) {
                            if (revertRoomData != null && revertRoomData.Count > 0) {
                                var bFind = false;
                                foreach (var mHome in revertRoomData) {
@@ -508,19 +514,29 @@
                                        break;
                                    }
                                }
                                //if (!bFind) {
                                //    UserConfig.Instance.CurrentRegion = revertRoomData [0];
                                //}
                                if (!bFind) {
                                    UserConfig.Instance.CurrentRegion = revertRoomData [0];
                                    var findRoom2 = revertRoomData.Find ((obj) => obj.IsOthreShare == false);
                                    if (findRoom2 != null) {
                                        UserConfig.Instance.CurrentRegion = findRoom2;
                                    } else {
                                        UserConfig.Instance.CurrentRegion = revertRoomData [0];
                                    }
                                }
                                IO.FileUtils.DeleteAllFile ();
                            }
                        } else {
                            //刷新住宅 解决子账号问题
                            UserConfig.Instance.CurrentRegion = findRoom;
                            Room.InitAllRoom ();
                            //}else {
                            //    //刷新住宅 解决子账号问题
                            //    UserConfig.Instance.CurrentRegion = findRoom;
                            //    Room.InitAllRoom ();
                            //}
                        }
                    }
                }
                    ////原方案
                    //GetAllBindGatewarysPagger (revertRoomData);
                    ////获取当前住宅网关方案
@@ -605,8 +621,8 @@
                A31MusicModel.Refresh ();
                Application.RunOnMainThread (() => {
                    Close ();
                    UserMiddle.Init (false,true);
                    EquipmentPublicClass.CheckLinkRemote (2);
                    UserMiddle.Init (false, true);
                    EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
                });
            } else {