JLChen
2020-02-20 965290476c027deb96891cde1095d9a100581a6b
Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs
@@ -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,17 +514,27 @@
                                        break;
                                    }
                                }
                                //if (!bFind) {
                                //    UserConfig.Instance.CurrentRegion = revertRoomData [0];
                                //}
                                if (!bFind) {
                                    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 ();
                            //}
                        }
                    }
                    ////原方案
@@ -606,7 +622,7 @@
                Application.RunOnMainThread (() => {
                    Close ();
                    UserMiddle.Init (false,true);
                    EquipmentPublicClass.CheckLinkRemote (2);
                    EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
                });
            } else {