2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

 ZigbeeApp/Shared/Phone/Device/Account/AccountLogin.cs

@@ -324,7 +324,7 @@
            }
            else
            {
                Login(phoneRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
                Login(emailRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
            }

        }
@@ -367,27 +367,20 @@
                        {
                            return;
                        }
                        this.RemoveFromParent();

                        UserPage.Instance.Fresh();
                        HomePage.Instance.ShowLoginLoadView();

                        new System.Threading.Thread(async () =>
                        {
                            //启动ZigBee
                            ZigBee.Common.Application.Init();
                            //存储数据
                            var responseDataObj = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.UserLoginRes>(revertObj.ResponseData.ToString());
                            var revertData = responseDataObj;
                            Config.ReFresh();
                            Config.Instance.Account = revertData.Account;
                            Config.Instance.MqttKey = revertData.MqttKey;
                            Config.Instance.Password = passwordStr;

                            Config.Instance.MD5PWD = revertData.MD5PWD;

                            Config.Instance.Guid = revertData.Guid;
                            Config.Instance.LoginDateTime = DateTime.Now;
                            Config.Instance.ConnectZigbeeMqttBrokerPwd = revertData.ConnectZigbeeMqttBrokerPwd;
                            Config.Instance.ConnectZigbeeMqttClientId = revertData.ConnectZigbeeMqttClientId;
                            Config.Instance.ZigbeeMqttBrokerLoadSubDomain = revertData.ZigbeeMqttBrokerLoadSubDomain;
                            if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
                            {
                                Config.Instance.AccountList.Add(revertData.Account);
@@ -395,15 +388,18 @@
                            Config.Instance.Save();

                            var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                            var homes = await House.GetHomeLists();
                            var homes = await House.GetHomeLists();

                            //启动ZigBee

                            ZigBee.Common.Application.Init();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            Shared.Common.Room.CanInitAllRoom = true;
                            Shared.Common.Room.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {
                                UserPage.Instance.Fresh();
                                CommonPage.Loading.Hide();
                                this.RemoveFromParent();
                                CommonPage.Instance.RemoveViewByTag("Login");
                                UserPage.Instance.Fresh();
                            });
                        })
                        { IsBackground = true }.Start();
@@ -509,21 +505,22 @@
                                var re = await isBindAuthAsync(authStr);
                                if (re)
                                {
                                    //直接登录
                                    //this.RemoveFromParent();

                                    //UserPage.Instance.Fresh();
                                    //启动ZigBee
                                    ZigBee.Common.Application.Init();
                                    Application.RunOnMainThread(() =>
                                    {

                                        //直接登录

                                        HomePage.Instance.ShowLoginLoadView();
                                    });
                                    var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                                    var homes = await House.GetHomeLists();
                                    var homes = await House.GetHomeLists();

                                    //启动ZigBee

                                    ZigBee.Common.Application.Init();
                                    //刷新个人中心的内存及线程
                                    await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                                    Shared.Common.Room.CanInitAllRoom = true;
                                    Shared.Common.Room.InitAllRoom();
                                    Application.RunOnMainThread(() =>
                                    {
                                        this.RemoveFromParent();
                                        CommonPage.Instance.RemoveViewByTag("Login");
                                        UserPage.Instance.Fresh();
                                    });
                                }
@@ -541,14 +538,14 @@
                            })
                            { IsBackground = true }.Start();
                        }
                    };
                //}
            //};
                    };

            //}

            //};

#endif



#if iOS
            GateWay.Ios.AppDelegate.WXLogin();
            GateWay.Ios.AppDelegate.RespAction = (authStr) =>
            Home.IOS.AppDelegate.WXLogin();

            Home.IOS.AppDelegate.RespAction = (authStr) =>
            {
                if (authStr == null)
                {
@@ -566,13 +563,12 @@
                            //this.RemoveFromParent();

                            //UserPage.Instance.Fresh();
                            //启动ZigBee
                            ZigBee.Common.Application.Init();
                            var resultRegID = await Shared.Common.CommonPage.Instance.PushRegID();
                            var homes = await House.GetHomeLists();
                            //启动ZigBee
                            ZigBee.Common.Application.Init();
                            //刷新个人中心的内存及线程
                            await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
                            Shared.Common.Room.CanInitAllRoom = true;
                            Shared.Common.Room.InitAllRoom();
                            Application.RunOnMainThread(() =>
                            {
@@ -596,9 +592,9 @@
                }
            };
#endif









        }

        /// <summary>
@@ -639,11 +635,7 @@
                Config.Instance.Account = revertData.Account;
                Config.Instance.MD5PWD = revertData.MD5PWD;
                Config.Instance.Guid = revertData.Guid;
                Config.Instance.MqttKey = revertData.MqttKey;
                Config.Instance.LoginDateTime = DateTime.Now;
                Config.Instance.ConnectZigbeeMqttBrokerPwd = revertData.ConnectZigbeeMqttBrokerPwd;
                Config.Instance.ConnectZigbeeMqttClientId = revertData.ConnectZigbeeMqttClientId;
                Config.Instance.ZigbeeMqttBrokerLoadSubDomain = revertData.ZigbeeMqttBrokerLoadSubDomain;
                if (Config.Instance.AccountList.Find((obj) => obj == revertData.Account) == null)
                {
                    Config.Instance.AccountList.Add(revertData.Account);