2019.12.3

gxc

2019-12-03 d12e7730bb88d57763a6caaeacb0248a65bf3309

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

@@ -83,6 +83,7 @@
        /// </summary>
        public AccountLogin()
        {
            CommonPage.Instance.IsDrawerLockMode = true;
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            Tag = "Login";
        }
@@ -324,7 +325,7 @@
            }
            else
            {
                Login(phoneRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
                Login(emailRow.AccountET.Text.Trim(), pwdRow.PasswrodET.Text.Trim());
            }

        }
@@ -377,14 +378,10 @@
                            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);
@@ -509,8 +506,11 @@
                                var re = await isBindAuthAsync(authStr);
                                if (re)
                                {
                                    //直接登录
                                    HomePage.Instance.ShowLoginLoadView();
                                    Application.RunOnMainThread(() =>
                                    {

                                        //直接登录

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

                                    //启动ZigBee

@@ -539,14 +539,14 @@
                            })
                            { IsBackground = true }.Start();
                        }
                    };

            //}

            //};

                    };
                //}
            //};
#endif



#if iOS
            Home.IOS.AppDelegate.WXLogin();
            Home.IOS.AppDelegate.RespAction = (authStr) =>
            GateWay.Ios.AppDelegate.WXLogin();
            GateWay.Ios.AppDelegate.RespAction = (authStr) =>
            {
                if (authStr == null)
                {
@@ -636,11 +636,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);
@@ -648,13 +644,13 @@
                Config.Instance.Save();
                return true;
            }
            else 
            else
            {
                return false;
            }
        }

      


        /// <summary>
        /// phone/email 选择