2020-09-03 1.修改风扇默认为关状态。2.Alexa添加设备时，去掉空调和通用开关选择添加支持。 3.场景增加通用开关添加和发送控制支持，A...

JLChen

2020-09-03 d8545fbd1b36a6766c57c987e5d89862b470fed9

 Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountLogin.cs

@@ -78,8 +78,10 @@

            };
#if DEBUG
            //Text = "18926269190@189.cn"
            etAccount.Text = "18926269190@189.cn";
            //etAccount.Text = "721343314@qq.com";
            //etAccount.Text = "crabtreel12019@gmail.com";
            //etAccount.Text = "2791308028@qq.com";
#endif

            accountView.AddChidren (etAccount);
@@ -139,8 +141,8 @@
            Button btnShowPassword = new Button () {
                X = etPasswrod.Right,
                Y = etPasswrod.Y + Application.GetRealHeight (12),
                Width = Application.GetRealWidth (73),
                Height = Application.GetRealHeight (60),
                Width = Application.GetMinRealAverage (73),
                Height = Application.GetMinRealAverage (60),
                UnSelectedImagePath = "CrabtreeAdd/HidePW.png",
                SelectedImagePath = "CrabtreeAdd/ShowPW.png", 
                BorderColor = SkinStyle.Current.Transparent,
@@ -260,7 +262,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 +286,7 @@

                    } catch (Exception ex) {
                        MainPage.FailureToServer ();
                        Console.WriteLine (ex.Message);
                        Utlis.WriteLine (ex.Message);
                    } finally {
                        Application.RunOnMainThread (() => {
                            MainPage.Loading.Hide ();
@@ -498,7 +500,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 +516,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 +623,8 @@
                A31MusicModel.Refresh ();
                Application.RunOnMainThread (() => {
                    Close ();
                    UserMiddle.Init (false,true);
                    EquipmentPublicClass.CheckLinkRemote (2);
                    UserMiddle.Init (false, true);
                    EquipmentPublicClass.CheckLinkRemote (UserConfig.Instance.internetStatus);
                });
            } else {