2019.11.29

gxc

2019-11-29 b94f318b1cb5c3618dd53b5240c1d999c8427b71

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

old mode 100755
new mode 100644
@@ -87,6 +87,7 @@
        /// </summary>
        public AccountLoginByCode()
        {
            CommonPage.Instance.IsDrawerLockMode = true;
            Tag = "Login";
            BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor;
            t = new Timer();
@@ -176,7 +177,7 @@
                Width = Application.GetRealWidth(942),
                Gravity = Gravity.CenterHorizontal,
                BackgroundColor = ZigbeeColor.Current.GXCBackgroundColor,
                Radius = (uint)Application.GetRealHeight(30)
                Radius = (uint)Application.GetRealHeight(17)
            };
            midFrameLayout.AddChidren(accountCodeFL);

@@ -216,7 +217,7 @@
            LoginByAccountPWDBtn = new Button()
            {
                X = Application.GetRealWidth(98),
                Y = Application.GetRealHeight(1446),
                Y = Application.GetRealHeight(1466),
                Width = Application.GetRealWidth(300),
                Height = Application.GetRealHeight(49),
                TextID = R.MyInternationalizationString.LoginByAccountPWD,
@@ -229,7 +230,7 @@
            registerBtn = new Button()
            {
                X = Application.GetRealWidth(738),
                Y = Application.GetRealHeight(1446),
                Y = Application.GetRealHeight(1466),
                Width = Application.GetRealWidth(244),
                Height = Application.GetRealHeight(49),
                TextID = R.MyInternationalizationString.Register,
@@ -298,11 +299,8 @@
                    {
                        return;
                    }
                    this.RemoveFromParent();
                    Application.MainPage?.RemoveViewByTag("Login");

                    UserPage.Instance.Fresh();

                    HomePage.Instance.ShowLoginLoadView();
                    new System.Threading.Thread(async () =>
                    {
                        //启动ZigBee
@@ -331,10 +329,11 @@
                        //刷新个人中心的内存及线程
                        await UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();

                        Shared.Common.Room.CanInitAllRoom = true;
                        Shared.Common.Room.InitAllRoom();
                        Application.RunOnMainThread(() =>
                        {
                            this.RemoveFromParent();
                            CommonPage.Instance.RemoveViewByTag("Login");
                            UserPage.Instance.Fresh();
                            CommonPage.Loading.Hide();
                        });
@@ -437,7 +436,7 @@
        private void AddPhoneOrEmailFL(FrameLayout accountCodeFrameLayout, string phoneOrEmail)
        {
            accountCodeFrameLayout.RemoveAll();

            account = string.Empty;
            if (phoneOrEmail == "Phone")
            {
                phoneRow = new PhoneRowForm();
@@ -471,13 +470,13 @@
            {
                IsRightAccount = true;
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = true;
                account= (sender as EditText).Text.Trim();
            }
            else
            {
                IsRightAccount = false;
                codeRow.SendCodeBtn.Enable = codeRow.SendCodeBtn.IsSelected = false;
            }
            account = (sender as EditText).Text.Trim();
        }

        /// <summary>